This fixes #7716.