revert cm 12 brach, cm is killing me

Going to need cleanup later