Don't always disable constrained DP. Dammit.