Revert the changes from r74463, they were causing test_xmlrpc to fail.