Backed out changeset 45d4f7b16c2f (bug 847559) for bustage.