Revert "Fixes for Linaro 4.7 Toolchain"

This reverts commit ce7e8209e48867b08a488eb404c5a07cd1b0d5d3.