Revert af61c98..71578d4

This rolls back to commit af61c9836427f99ac1d32dab28ebc8a406e3f5e2.