We will selectively revert on a branch only. This reverts commit f4e3d9d7. Change-Id: Iac786c87e4619ff1af8a13c46f9bb857043663f2