This is effectively a revert of #1173, to favor false-negatives over false-positives in the same-scope case. Closes #2044.