Backout a0016de79bf9 and 862431c42e72 for breakage, r=red