Apply the correct patch for ER. PR against the 3.5 branch.

#2809