backout bug 832165 because it caused bug 837175 and broke everyone