Revert "Make tests/api_tests.py run on py3k"

This reverts commit 909331ab7d863866e19dfc007989b92bb3345ebd.

Change-Id: Icc9ddcd431a1c68702ade89075406eff6a15f59e
Merge "Revert "Make tests/api_tests.py run on py3k""