swift234

Revert "fix a problem in my previous patch, which would cause it to
crash on ClosureExpr's that"

This reverts commit r24094.  It depends on r24085, which I'm reverting.

Swift SVN r24101