Fix bug #21108.