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