xalanj commit : undoing the logic of previous commit, since it had
unwanted codebase side effects
6 files changed