6bb17af2e3
This reverts commit d5294ebfa0.
It turned out to be more work and I don't wanna deal with it right now.