This reverts commit efc37d0855. Turns out we need to clean up the dnd code some more, first.
efc37d0855