Revert "Fixes to allow building with Linaro 4.7 toolchain"

This reverts commit abad1fbc17c6e286a6da2ad64e6dfc2e58470b51.