Revert "Added setting DictionaryAsKeyValuePairs"

This reverts commit 4580b1d0f9f2e7e902290c51e40f411912e4091f.