This reverts commit 2eb7d6cd. This is better Python3 syntax and with no Python2 support we can do this.