Revert "Merge pull request #719 from rhyolight/revert-python-build-changes"

This reverts commit f35d28839580e24fc48115f6c6ac3022f1e5ed6e, reversing
changes made to a667e0e0efe035122a211964dd93eb86c57f9141.
Merge pull request #720 from oxtopus/revert-719

Restore recent CMake/Python changes