This fixes #7672.