Revert linaro changes for rom #3