Revert "fix build with Linaro GCC 4.9.1"

This reverts commit e42f19ef0a40bdd19c5befda5f8c16c46b84db9d.