Repatched due to test failing (sometimes?) when running a full whois integration build