Backed out changeset 4aa9183846c6 (bug 984891) for "AssertionError: repeating domain in.net makes no sense"