Revert all CyanogenMod changes
Revert other CM changes