This fixes #8119.