Backed out changeset ccde95bd3c7e (bug 1074165) for bustage