Revert cm telephony commit