[Bug 207571] Fix the dictionary proliferation problem