This fixes #8225.