This is a wire format change that the projects are not ready for yet (example Nova).
We should do this as part of a major version bump (2.x) with ample time for folks to move up.
Nova review to prepare the Nova code base for this change:
Ib7e60ed94edd1eb409baf8c29c61237d85944787
This reverts commit 5b0827a3df584b3e26bb44e5358cc28ac4a91636.
Change-Id: Ic4bf047b40c1dad2f8d2bc0afda934e47dba1f9d