Revert 54815 for 2.5.1 release. Can be applied after 2.5 branch is unfrozen.
Revert 54815 for 2.5.1 release. Can be applied after 2.5 branch is unfrozen.

sk-/python2.7-type-annotator,sk-/python2.7-type-annotator,sk-/python2.7-type-annotator