Restore Task#workitem to fix entity storage