Re-enable comment code [CI all passes]