Revert "Linaro 4.8 fixes"

This reverts commit 31616c961257d06a3861a89fb330ccc6d998b16f.
Revert "Linaro 4.8 fixes"

This reverts commit b9c0f47da22ccc3623637ba7e210996d94ad8e04.