This fixes #8279.