Revert "Remove duplicate dictionaries"

This reverts commit 47d43f724ccd1e39bda509844e030f3d9b7c1f2f.