Revert DM due to consensus matching errors

This commit reverts DM to commit 7853aafb8de25b3d08dd3adf4e17bed1c4aa5c43, but nothing else.