Reverts apple/swift#19168 to reinstate apple/swift#17668 which missed a “squash” first time around. Implementation for SE-200