This reverts commit af839a96. Some issues appear to be being caused by this. Reverting whilst we investigate.