Preserve map/set order while encoding and decoding.
Remove our organization.
Add back our organization.