Revert linaro changes for rom