Revert "More efficient incremental task scheduling."

This reverts commit 159918aa4f0abfcd90be0a46aff9e669f7b4b61e.
Return number of evaluated tasks.