Backed out changeset 454706720bbc (bug 888493) for build bustage
CLOSED TREE