Backed out changeset 006353e45fa7 (bug 833143) for robocop crashes; CLOSED TREE