FS-6822 #comment The code in question appears to have been added by me (18f20e24).  I think this patch is the correct solution.