Revert "Merge pull request #3012 from WalterBright/merge-with-dmc"

This reverts commit ef4806ad5388bf69bb1b663235918a731490bc22 because
with it the compilation fails.