Revert "Merge branch 'DIALOGITEMS'"

This reverts commit c726164adab230db84825d524095d487a07c12fb, reversing
changes made to ff1fcafb2657f28436a80ecd1a91025e05f5e987.