re-add ICommentingTool to support migration