I don't particularly mind whether it's in this patch or a follow-up one, but if it's dead code, we should get rid of it.