swift234

Undo the parts of r18941 that depends on LLVM changes.

...which I haven't actually committed yet.

Swift SVN r18945