Revert "Adjust how variable vector extraction is done."

This reverts commit 428a4feef8594142e5324c0f5cfc8281e43bf75a.
See PR93974.
2 files changed