Backout fix for bug 922601 (changeset a36ab6c7f174) to fix regressions,a=lblakk