Remove the code to change type-resolution semantics. Fixes issue 1065