Backed out changeset 71d1bd406c7e (bug 849845) and changeset af753b784e28 (bug 849958) to see if it fixes robocop timeouts on a CLOSED TREE.