This reverts commit b4cc85c4, reversing
changes made to f22273a6.

There are failing tests on main related to this change that didn't show
up on CI before I merged so reverting until we can figure it out.