reverted premature change to CMap