Revert "Out with the old"

This reverts commit 11092b11ab88d1fe744d82b862dca990eeecdf36.