Add TODO to remove discussion reply hack