Apparently I failed to make this work when I fixed it in the disassembler way back in r224862.

llvm-svn: 319611