Revert "Linaro now?"

This reverts commit b5f8a4334ca7bb1375a0a148195af208e70d15a5.