Revert d654b72..d4d83b7

This rolls back to commit d654b721980f7a331e7ed69c65c38efc723301db.