Revert "Linaro 4.8 fixes"

This reverts commit 19e4c469e87449ea4ea90cf37214a2f6a622f2a6.