Revert the dict comprehension.

Python2.6 does not support dict comprehension.