Backout patch for bug 887950 in favor of the compatibility hack that landed.
Backout patch for bug 875165 in favor of the compatibility hack that landed.