There are builders that do not have python 3.6. Revert until this situation can be rectified

This reverts commit 0703b075.