Patch from Mark Wooding: when I did r7980 I had completely failed to