Revert 15e360b..f44d0c8

This rolls back to commit 15e360b48f9496b2dc8ccd097c9d5c9e4b16be79.
Works, but multiple tasks created while creating one task