This reverts commit 7766bd5b35 (#13933). The unused column is actually used, but much further down in the function.
7766bd5b35