And now for something completely different: Finish fixing #10252 again.
And now for something completely different: Finish fixing #10252 again.

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