This reverts commit 0968a936. Reason for revert: Reland Change-Id: I78a0097b9bea6da83dbab2fd507670bbf2edab35