Revert "Revert "Revert "Itnro-DP"""

This reverts commit e69b58832412e78172b88f014115e3fbd27f22a5.