Revert "Fixes for LINARO GCC 4.8"

This reverts commit 26bd57969359d8bd7e60f2b4a584f33966b4d49b.