revert most of the codeaurora changes