This fixes #7937.