revert linaro change for now