Revert "Track tasks only"

This reverts commit f641db4f49ffc2496a7fc55fa0cd164d5411f713.