Revert d0895fb..ba2c052

This rolls back to commit d0895fb134bda620155bac24ffe5ac7901fadcf5.