This fixes #8114.