swift234

Fix up the tests which were failing after my patch and
bring back the patch.


Swift SVN r12263