Revert "Fix compilation with Linaro toolchain 4.7"

This reverts commit 7d8e04995d6637809528211d40cc6562e1cf5b5f.