As we discussed this is only needed to help the next refactoring.