This fixes #7944.