"Let's just pretend none of this happened"

This reverts commit 7820ad3f429e225d14e6623f77961923d239f0e4.