Should be unneeded with Python 2.7 and up. Added some unicode_literals along the way.
This regression was introduced by the 'unicode_literals' patch.