Revert "More work on new tasks"

This reverts commit d9f8eeb9d999ff5f048fca124cd1cb8a6a9c88b6.