This reverts commit 78b66672. Reason for revert: Feature punted Change-Id: I4b17d1b186369f2ecfcecf4906cd2b99a66bc7a0