backout 807f952a0095b4f6b55432f92606887c90f918b1 on v1.0.1 (bug 844205) which was landed by mistake