This reverts commit 4efd4c16f9
.
Reason for revert: Breaks auth behavior
Fixes: 347858844
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:16f973b8364171116ce16b951113d64beefe506c)
Merged-In: Ie1b8be9dfae2cba7e2b37187f08cf1360aedf29f
Change-Id: Ie1b8be9dfae2cba7e2b37187f08cf1360aedf29f