Revert "Bring back awesomesness needed for true linaro"

This reverts commit b945259d685df492fdf61e24435af591e2ee7c73.