Bug 876167: backout the backout since it appears the upstream bug is not fixed rs=philor