Revert "Merged py3 into master"

This reverts commit f0b2f4903bf5b89d8b51dbaece043c1a759a091a, reversing
changes made to cbf6b2f2c91e229759ef29cfbcba0ab4d8e1207e.