Revert "Merge branch 'feature/task-library'"

This reverts commit e31c90f17d81cdb65e62c991dc88a95f525ba684, reversing
changes made to d7af9a5e08a2e5cb5b2be66233b352843ba4db2e.