The new script in #24860 showed we weren't using two variables that should be in place; this PR restores them to their former glory.
The new script in #24860 showed we weren't using two variables that should be in place; this PR restores them to their former glory.