Revert "Out with the old, keep the current, and prepare for the new"

This reverts commit 17d324b04fe933798f2ad0555d294617910adb2c.