Issue #1998900 by skwashd: Remove dpm() calls