Revert #4022, as the solution is incomplete

This reverts commit 4c8662c6c1171c8ccc161ed90aa144ba29e7de3b, reversing
changes made to 0937f32ff9b9f3d150bb2caea12f21a845dd730c.

## Verification

- [ ] Things should be as they were before #4022 

Thanks for the quick turnaround @kernelsmith but @hmoore-r7 has some concerns about the effects here.

Will summarize in a moment.