Revert "speed up searches for tasks outputting vars"

This reverts commit cb71ddddf99d7dfe17f7ba69d5cf8a0d767c68e0.
another attempt to speed up searches