Revert "Re-apply fixed version of 108749, correctly conditionalizing the new

sections on", this change uncovered a possible linker bug which resulted in the
wrong messages getting dispatched. Backing this out while we investigate...

llvm-svn: 109817