Revert r98679. The disassembler will be updated to depend on the existence of