Restore compat with DM 1.x