Changes to make the client backwards compatible after previous changes that broke all our clients.

Changes to make the client backwards compatible after previous changes that broke all our clients.