Revert "--add D"

This reverts commit 67ed8c6851b18231d39e0d691a8cb5358a77729e.
Revert "Revert "--add D""

This reverts commit 3d5c010769aa8fac97b677be39d380f91d59b1d9.