Temporarily backed out some of the constant DotDict changes
Merge commit '897fec9'