Revert "Linaro 4.8 fixes"

This reverts commit 8ddcad4f9279fbfd16cebde82dd1fcd43e5801fe.