Revert "This is a psuedo cherry pick. A bunch of stuff happened in the future to repose vavle tes, so i couldn't just cherry-pick the one thing. Instead i aded this line which i beleive is the minimal i need of those changes to get the tests working."

This reverts commit 443135f56cb64ee4a92085f6f91b0b1b158af961.
Unfortunately doing a blanket fix caused more problems than it fixed. This has alreqady been fixed in the future, so i'll just fix this case.