Temporary revert; CMF 1.3 is also ready and is a bigger PITA to re-roll. This reverts commit d806a9bb.