Applied original patch for 10414.