This reverts commit 7034d7ab. I accidentally didn't push my 3.31.3 commit so let's temporarily revert this.