Revert "Make the construction of a 2D dict cleaner"

This reverts commit 8427c1cdd8d06c6c924f5573781fdf70c93da123.