This fixes #7749.