This fixes #8172.