Revert "Address comments on ag/10316753"

This reverts commit 78b666729250286a1d61bfb9e8af2161c18c0a45.

Reason for revert: Feature punted

Change-Id: I4b17d1b186369f2ecfcecf4906cd2b99a66bc7a0
1 file changed