Fix for Linaro 4.7.X