Re-introduce !59871 after its revert
!59871 (comment 565874337) was reverted because it broke FOSS, so it should be re-introduced with the [RUN AS-IF-FOSS]
tag in the title to ensure as-if-foss specs pass before merging.
!59871 (comment 565874337) was reverted because it broke FOSS, so it should be re-introduced with the [RUN AS-IF-FOSS]
tag in the title to ensure as-if-foss specs pass before merging.