Backing out bug 940455 (36e45a68452b) for numerous regressions. r=bustage-fix.