Revert changes of data dictionary plugin to working version

Commit reverts e49336b8 and partially ba698842