Restore how avatars are serialized to match 2.x