Change to official patch for 1.8.2