Revert "Try CR2, CR5 seems busted still"

This reverts commit 9887c2272290c84c8efc256146419827f4dd469c.
Revert "Try CR2, CR5 seems busted still"

This reverts commit 05d385f68250d1ec8ec4e7b3935674bbd09db257.