This fixes #7934.