Revert Linaro 4.9