Revert "Change to allow forward references to tasks"

This reverts commit e4e11899ce6982b294cc894c7c1eebc926638928.
Revert "Revert "Change to allow forward references to tasks""

This reverts commit c762918b46993706300b2e5ccfbfe3f9a3e112e4.