Revert opt/telephony to CM