Revert "nearly done"

This reverts commit 04774f5f6af1fbf9a99d0bbbfc547986faa3f4ec.