Revert "Skip setting up DPM"

This reverts commit 697305e9ba7718827e3be841ae32d57b632da2b1.