Revert "Get task graph back to same as master"

Master is broken, so back to original for now.

This reverts commit 409531ab.