#677611 patch for 2.6.4 - header checks can take excessive time