[Backport maintenance/3.3.x] change the type annotation error heuristic

[Backport maintenance/3.3.x] change the type annotation error heuristic #1302