Revert "Linaro GCC 4.9.1: fix compilation errors"

This reverts commit 04b580d06be62c9142e11a5d46541800d2be980a.