Merge first part of #4848 (actual fix to "type pollution")

Merge first part of #4848 (actual fix to "type pollution") #903