Revert r213467, it breaks non-thumb mode.