This fixes #7402.