This reverts commit a11ea9ac. Reason for revert: This would just confuse people Bug: 64382372 Change-Id: I69bdc0fb79831b5ce546205fd40a3300d039de71