backout of rev 45253e02bde3, fd02f1217e4c, 75217485ce5a b=981804