Revert "Some fixes in dpi groups"

This reverts commit e0fa04f4e6b32e8349a4f02f5da00ce76d5a0c7d.