Don't interpret things as capability instructions that aren't.
Reintroduce some code that was accidentally deleted in the merge.