swift

437589d1 - Merge pull request #86950 from slavapestov/remove-more-solver-hacks