Revert "fix build with Linaro GCC 4.9.1"

This reverts commit 1668f9323c7a8161a85dea86d89ed35ea296dcd5.