Roll back changes to 'h' format code -- too much breaks.  Other changes stay.
Roll back changes to 'h' format code -- too much breaks.  Other
changes stay.

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