Rollback TaskThread code

See 68e0b273 and 98af4923
Merge pull request #190 from halorgium/fix-task-thread

Rollback TaskThread code