Bring back optimisation

This reverts commit 49d3f711050dc4ffebedb98907a811b294fa2fb7.