Revert "Linaro 4.8 fixes"

This reverts commit 28e00338b36051f4480ba290c950de056f7a1c21.