Revert "Altered for CM-12.0"

This reverts commit 0adc307de70d498116372f4751516a2d1ef44713.