Backout 312925464acb:f24d5b2801f8 (bug 911375) for breaking the build