Added back changes to comment adapter