This fixes #8049.