We need to wait until GMail corruption fix is in. This reverts commit 6716bd33. Change-Id: Ie3c335e18901d24d878f81fb76b7065520fa32e5