Backed out changeset 4887f7d34df2 (bug 896896) for causing bug 933733. a=lsblakk