This fixes #8268.