Fix recent changes that have broken DDMD
Merge pull request #3390 from yebblies/ddmdfix

[DDMD] Fix recent changes that have broken DDMD