Reverts #10483 and re-lands #10474.
@swift-ci test
Login to write a write a comment.
Login via GitHub
Reverts #10483 and re-lands #10474.