Unbreak the non-DMD build