This reverts commit 7b50c935f8. Reason for revert: Deferred to a future release. Change-Id: Ia66c37f0ab9734dee73c930d10d7469d5fd57254
7b50c935f8