Bug: 77912907 This reverts commit 6cf3e7c4. Reason for revert: negative dogfood feedback Change-Id: I83873286424b93fd9994dfad2e385048cfe6e478