Revert "Linaro 4.8 fixes"

This reverts commit 5749327549812e4271898d878993d95e5de1975e.

Change-Id: I74fcda2aaf2c2b3e816048949327b9aecc887006