Revert "Fix the dict related warnings"

This reverts commit 018d0bd5d798db36ddb5ebd789c6ced3572b65a2.