Undo revision 58533 58534 fixes.  Those were a workaround for a problem introduced by 58385.
Undo revision 58533 58534 fixes.  Those were a workaround for
a problem introduced by 58385.

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