Squash fix from linaro