No longer need this patch, upstream fixed it differently in 2008

ok sthen@