Jkarni/fix/revert xml comments

Reviewed in #1087