Revert "Dictionary fix"

This reverts commit 4cc07580e2d7d1fedfaec032c01cb2fcb326e842.