This fixes #7471.