Backed out changeset ac1f14b91331 (bug 917942) for bustage.