Revert "Linaro 4.8 fixes"

This reverts commit 5deb4a9b8eda8908c6d9a33951483fb3a04c64e2.