Applied patch from bug #2154.