Revert "Selectively restore non-stupid parts of stuff we had"

This reverts commit d2711637c9b8c05b0757579b730a2b99b44dd121.