Revert "Err, CM'ey style."

This reverts commit 107ce35ac827cf607622251acda6a1b464776c66.