Revert most of r154844, which was disabled in r155975. Keep around the

refactorings in that revision, and some of the subsequent bugfixes, which
seem to be relevant even without delayed exception specification parsing.

llvm-svn: 156031