which in requirements always uses ORIGINAL_PATHS now

Fixes #22002.
Add ENV.append_path
Use ENV.append_path
Use ENV.prepend_path