I remember that I had to introduce this hack in the weekend before release. The reason was that we started to pass all nodes, not only those which are required for provision/deploy.
Is it the case still? If we moved logic to Nailgun, do we still have to handle such conditions on statuses in Astute?