This reverts commit 3bde9c3f42. This change is a part of a series that is not backwards compatible. It broke applications using the client library. Change-Id: Id01a0a0feb601539d3855f445ebaf6a3cc000610 Partial-Bug: #1340596
3bde9c3f42