Merge "Revert "audit use of net.dns. property""