Backed out changeset bb4254c72efb (bug 961238) for robocop1 bustage on a CLOSED TREE