Backout bug 896896 for bug for causing bug 933733. a=lsblakk