revrt some linaro for now