diff --git a/app/views/photos/show.html.haml b/app/views/photos/show.html.haml
index 3aa7fb737..3c31ebf73 100644
--- a/app/views/photos/show.html.haml
+++ b/app/views/photos/show.html.haml
@@ -66,11 +66,12 @@
     = t('_comments')
 
   #photo_stream.stream.show
-    - if (defined?(current_user) && !current_user.liked?(@parent))
-      %span.like_links
-        = link_to t('shared.stream_element.like'), {:controller => "likes", :action => "create", :positive => 'true', :post_id => @parent.id }, :class => "like_it", :remote => true
-        |
-        = link_to t('shared.stream_element.dislike'), {:controller => "likes", :action =>  "create", :positive => 'false', :post_id => @parent.id }, :class => "dislike_it", :remote => true
+    // TODO(likes)
+    /- if (defined?(current_user) && !current_user.liked?(@parent))
+    /  %span.like_links
+    /    = link_to t('shared.stream_element.like'), {:controller => "likes", :action => "create", :positive => 'true', :post_id => @parent.id }, :class => "like_it", :remote => true
+    /    |
+    /    = link_to t('shared.stream_element.dislike'), {:controller => "likes", :action =>  "create", :positive => 'false', :post_id => @parent.id }, :class => "dislike_it", :remote => true
 
     %div{:data=>{:guid=>@parent.id}}
       .likes_container
diff --git a/app/views/shared/_stream_element.html.haml b/app/views/shared/_stream_element.html.haml
index eca6529f4..55ab09a4e 100644
--- a/app/views/shared/_stream_element.html.haml
+++ b/app/views/shared/_stream_element.html.haml
@@ -33,14 +33,16 @@
 
       - unless (defined?(@commenting_disabled) && @commenting_disabled)
         = link_to t('comments.new_comment.comment'), '#', :class => 'focus_comment_textarea'
-        - if (defined?(current_user) && !current_user.liked?(post))
-          %span.like_links
-            |
-            = link_to t('.like'), {:controller => "likes", :action => "create", :positive => 'true', :post_id => post.id }, :class => "like_it", :remote => true
-            |
-            = link_to t('.dislike'), {:controller => "likes", :action =>  "create", :positive => 'false', :post_id => post.id }, :class => "dislike_it", :remote => true
 
-    .likes_container
-      = render "likes/likes", :post_id => post.id, :likes => post.likes, :dislikes => post.dislikes, :current_user => current_user
+        / TODO(likes)
+        /- if (defined?(current_user) && !current_user.liked?(post))
+        /  %span.like_links
+        /    |
+        /    = link_to t('.like'), {:controller => "likes", :action => "create", :positive => 'true', :post_id => post.id }, :class => "like_it", :remote => true
+        /    |
+        /    = link_to t('.dislike'), {:controller => "likes", :action =>  "create", :positive => 'false', :post_id => post.id }, :class => "dislike_it", :remote => true
+
+    /.likes_container
+    /  = render "likes/likes", :post_id => post.id, :likes => post.likes, :dislikes => post.dislikes, :current_user => current_user
 
     = render "comments/comments", :post_id => post.id, :comments => post.comments, :current_user => current_user, :condensed => true, :commenting_disabled => (defined?(@commenting_disabled) && @commenting_disabled)