Revert "Revert "Revert "Undoing config changes, hoping this will fix races because DM doesn't really make sense <3"""

This reverts commit 6b9063b38ad3a751bcf521a4ed50658cdbc075fb.