This fixes #8263.