Revert ac72f16..9c845f2

This rolls back to commit ac72f1613a145c301e1279d5d5bc79c525a13ecd.