Fix stupid bug, stupidhead
Fix stupid bug, stupidhead

(The full-stack test should have been there from the beginning, and
would have caught this mistake.  :/  At least it's in place now, and
should help with future regressions.)
screamingmuse/rory,screamingmuse/rory,adammcfadden/rory,adammcfadden/rory