3ea3a37ad3
This reverts commit 90e0fbbead64b9d292ac0cfbd92072a0a2897a97. Reason for revert: Server side fix is in prod. Change-Id: I2896f1f1c3cff8086531eaf1c9b8566d18e5984d