Revert optimisation

This reverts commit 6136a6d86a4f3d557a4592f18c795ac43c33be61.