Applied patch from bug #2235