swift

471af31c - Merge pull request #17751 from xedin/cleanup-after-simplify