This reverts commit 4e421b23 as this seemed to have broke Python 3 executable detection on some builders.