This fixes #7712.