This reverts commit 14af825d. Reason for revert: The feature was punted out of R. Change-Id: Id9ecdac5292eeddf7c12f2330421248b0f8355a9