Backed out changeset 152c5094843c (bug 1066726) for bustage.