Revert "some more linaro"

This reverts commit 2ddf0404dccfaf81e472c58600ef465f298c59e4.