Remove the code to change type-resolution semantics. Fixes issue 1065
Merge remote-tracking branch: upstream/master