MFC r318437:
Revert local changes to find_progenv accidentally committed in r318436
MFC with: r318436