Backed out changeset 9742b31c634a (bug 1073419) for bustage