undoing change that broke trunk.  Need to find a better solution to this.
undoing change that broke trunk.  Need to find a better solution to this.

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