Backed out changeset fe00dbf89462 (bug 1063156) for bustage