Reverted r84315 and r84316, with Benjamin's blessing.  The tests were fine.  They were failing due to a problem exposed in r84307 and fixed in r84317.   See Issue 8781 for details.
Reverted r84315 and r84316, with Benjamin's blessing.  The tests were
fine.  They were failing due to a problem exposed in r84307 and fixed
in r84317.   See Issue 8781 for details.

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