Backed out changeset 4f22708024f9 (bug 836450) for robocop failiures on a CLOSED TREE.