Revert 4.8 linaro fix