Backed out changeset ea2d05f0a053 (bug 856767) for robocop bustage on a CLOSED TREE.