Revert previous Comments component refactoring, which is not compatible with ecommerce/review component