reverting cm fixes