Revert "Deprecated DictionaryHandler"

This reverts commit 6959d7f19abcae4e0944f13a650cd97eb2212deb.