This fixes a bug in f0505c which wasn't noticed until 7a0b9daa had landed. This triggered a revert of 7a0b9daa, which will be reapplied after this fix.