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

This reverts commit ef4806ad5388bf69bb1b663235918a731490bc22 because
with it the compilation fails.

I don't know how to fix it and it seems like nobody is really interested in
fixing it, so it might be better to just revert this.

Please merge #3046 before this one.