Revert "maintenance commit"
This reverts commit a669db43. The reverted commit was introduced due to misoperation possibly with git-new-workdir, and actually reverted previous changes made on master. By reverting it we now recover these lost changes.
Showing with 208 additions and 104 deletions