This reverts behaviour that was introduced in crrev.com/c/5353357

(cherry picked from commit d5147af39630181c4e24af276bec500ed8f8f6ad)

Bug: 40058879,330360331,330210939
Change-Id: I1b111b568661f806d87bedbb40e055d69a8c1e52
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5392481
Commit-Queue: Vasiliy Telezhnikov <vasilyt@chromium.org>
Reviewed-by: Saifuddin Hitawala <hitawala@chromium.org>
Cr-Original-Commit-Position: refs/heads/main@{#1277904}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5402441
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Reviewed-by: Krishna Govind <govind@chromium.org>
Owners-Override: Krishna Govind <govind@chromium.org>
Cr-Commit-Position: refs/branch-heads/6379@{#12}
Cr-Branched-From: e5b4774389ecb8a127e4fc8afbc7c2e781b67716-refs/heads/main@{#1277564}