Don't need this, it was a comaptibility test.  The gained
flexibility from -D is far more important.

This reverts commit dfb09411.