Use empty private dictionaries instead of removing them.
Merge pull request #2912 from brendandahl/empty-private-dict

Use empty private dictionaries instead of removing them.