Revert "First pass optimisation"

This reverts commit 5a7cf09cb655bd0a3756ffbd7bc448875a4b1ff2.