Testing patch from issue #2229003.