Revert 58d77d7b210e644f8927bb05c7c3e76e44b62e6c.