This fixes #7462.