Add back a workaround that fixes some breakages from chris's last change.

Neither of us have yet figured out why this code is necessary, but stuff
breaks if its not there.  Still tracking this down...

llvm-svn: 23617