Fix #3858 in penance for being a grouchy old sod