commit a5b53f5697f4aefe2566f4b569f852850cec2e05
author Richard Smith <richard@metafoo.co.uk> Tue Dec 08 00:42:26 2020 -0800
committer Copybara-Service <copybara-worker@google.com> Tue Dec 08 16:52:34 2020 -0800
tree 01e35334305d0e5f2ab8d7ee8718bd6e2b29e893
parent 13dcdb21f4a1400a4daf215beac034ec6a23cba2

Revert "Add new 'preferred_name' attribute."

This change exposed a pre-existing issue with deserialization cycles
caused by a combination of attributes and template instantiations
violating the deserialization ordering restrictions; see PR48434 for
details.

A previous commit attempted to work around PR48434, but appears to have
only been a partial fix, and fixing this properly seems non-trivial.
Backing out for now to unblock things.

This reverts commit 98f76adf4e941738c0b9fe3b9965fa63603e9c89 and
commit a64c26a47a81b1b44e36d235ff3bc6a74a0bad9f.

GitOrigin-RevId: a1344779ab019a6bcd29842c1499343e15efbe87