Fix RT #88628 (close gh-7).