Revert "A very bad temp workaround with Linaro 4.9"

This reverts commit 44643b08aa2d62889bcca6f5054431412c9822dd.