Trying a patch from apache.