Revert "Almost done"

This reverts commit d2f2026e24d73f89de9d2d15ba2c504431d0afb2.