Remove compatibility hacks for early Python 2 versions