Revert rPHABcfd6daf92077d16d58f69230c1469db578067a64

Downstream patch fixed in a different way in upstream later.

Bug: T352822

Merge request reports

Loading