Reverted to e3542754dadaa8a9628191a1df95435710ec50bf commit. Just before
first approach of  manage the subtasks separately.