Backed out changeset 62d1670e37d9 (bug 896896) for bringing back bug 933733. a=lmandel