This reverts commit 5d042234. Reason for revert: User feedback Fixes: 157547868 Change-Id: I1ac06ff410212cd8c83764424268cf4aa38022d8