This fixes #7721.