This reverts commit 35edd704.

Revert the revert and extend the patch further to account for the use of
the `PYTHONINTERP_FOUND`.