Revert the change I committed yesterday, it caused a regression

with one armv7 unwind.  I'll look at updating this or finding a
different way of fixing it later tonight.

llvm-svn: 160198