the previous direct fix broke other things; this commit hopefully fixes both issues
Merge branch 'master' of github.com:swift-lang/swift-k