Revert some Linaro flags