messin around with newfangled cm overlay substitution

Change-Id: I4768c497f92c014e61056b751051f16c2307cf36