Revert be5ebb7..ee629b7

This rolls back to commit be5ebb77bfef5bbbd9a110055861bd87edb94a1f.