Revert "attempt to workaround py2.7 broken build"

This reverts commit 13f31f745ffec8ab77cdee7cb511724e586ee7cb.