Revert my revert...Fixed with CM update