swift234

revert my previous patch.  It doesn't break anything, but there is more going on
here than I think I understand, so I'm backing off.


Swift SVN r9909