Bug 922601. Partial backout to fix regressions. r=jesup,a=lsblakk