Get "dis -c -s" working again.

pr19324