This reverts commit 91831e79.
Breaks python 3.7 ..-. .- .. - -.-. .... .. . .-.
This will create a new commit in order to revert the existing changes.
