This fixes #7747.