This reverts commit c0e4bced61.
This was causing issues on older python versions. They are fixed in the
reland and have been tested as working.
This reverts commit c0e4bced61.
This was causing issues on older python versions. They are fixed in the
reland and have been tested as working.