reverting lots of pointless cm changes