Jkarni/fix/revert xml comments

@adampalay  - @nedbat - sorry this has been going on for so long and involving you every time. 

I'm still not sure how best to fix the errors that come up when running the LMS, so the best idea seems to be to revert it for now until I find the fix.