Revert "Ease a few optimisations off."

This reverts commit 18ca93d903b24f0d8b4f286d32427166a5d59cc0.
Revert "Linaro Optimisations"

This reverts commit ec069bb41f6f2f8ff78a5c437fb5f575284a6918.