When I original wrote this commit, I forgot to either tag it for stable or figure out a reasonable Fixes: tag. Ideally this should go to all the stable branches that are still active. I don't know which those are, but if @dbaker or @eric could tell me which those are, I can submit MRs.