Backed out changeset b3f02eb02208 (bug 1062666) due to build bustage