This fixes #8260.