Disable DR 2 again, and update tests that depends on it to explicity turn it on