which in requirements always uses ORIGINAL_PATHS now

Fixes #22002.