Merge "Revert "Use framework hints to determine dns query type.""