Merge pull request #41 from l1ll1/master

This pull request includes a revert
make the master branch of LoginTasks identical to onetab