Merge "Revert "Support for new gTLDs""