Reverted some changes I made to the existing DSG machinery.
* I still want that stuff to work as I write my own.