Revert "[CP] DDI utilties update"

This reverts commit f237bbe3.
2 files changed