Restore recent CMake/Python changes

Blocked on internal Grok pull request re: changes needed to the pipelines to support this change.

Reverts numenta/nupic#719