Justin Bradford's patch for increased proxy robustness.