This reverts commit b329513845. It was causing issues and we'll need to do more testing on this optimisation.
b329513845