revert linaro optimisations -- temp