This fixes #8437.