… (#90885)" This reverts commit eea81aa2. Also change isMapType as @vitalybuka suggested. Hope this fix sanitizer build problem.