I made this change in the branch before I added the `from __future__ import unicode_literals` change. I've now reverted it, since it's now unnecessary.