Reverted to CM for klte-common