Revert "Optimisation"

This reverts commit 0c56723428d5e0a16e88ef29e30a125a6247f08a.