This fixes #7819.