Revert "Done? Maybe?"

This reverts commit c424e30cc7bb6636a39ab47eae247cc44dbafa8e.