This reverts commit 25f034e970f82131d33f977b987b4452ef937dcf. This commit was
stacked atop 306478860b1f3f23e10b6c4ad54436863bbce0c4 which was reverted
in 98d573944e35eb902cefa8fdcedbdad59ee07203.

(cherry picked from commit db61af6366354b65dc7e451b93a09d2f429fd087)

Bug: None
Change-Id: Ie8a8007e01c0d28dc4b8b865bf0b7ab888ad388d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5505386
Reviewed-by: Ian Wells <iwells@chromium.org>
Commit-Queue: Elly FJ <ellyjones@chromium.org>
Owners-Override: Elly FJ <ellyjones@chromium.org>
Cr-Original-Commit-Position: refs/heads/main@{#1294965}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5512652
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Commit-Queue: Srinivas Sista <srinivassista@chromium.org>
Owners-Override: Srinivas Sista <srinivassista@chromium.org>
Cr-Commit-Position: refs/branch-heads/6452@{#11}
Cr-Branched-From: dc6e5f15f2f14a3206bcb9cf0297c3c73dc075b8-refs/heads/main@{#1294836}