Revert dns changes for now, as they require more testing.