Revert "Linaro 4.8 fixes (thx@nikhiljan93)"

This reverts commit 7151814042062d8990fd8585ccc6ff111b38260a.