Revert "Complete fixes for Python 3.5"
Revert "Complete fixes for Python 3.5"

This reverts commit 98a5e8034e9b1d31790247e096aeeed738078603.

faucetsdn/faucetapps,faucetsdn/faucetapps,faucetsdn/faucetapps,faucetsdn/faucetapps