Revert "Py3 adoption"

This reverts commit 50cd7198d6bba792c4dce86d4c9cab5a3d4430ee.

Reason for revert: Does not work

Change-Id: I03f94361b9fa38f599ee9e9fc5338b8a7e473b8b
9 files changed