Backed out changeset 8ce9e632939e (bug 925416) for bustage.