diff --git a/wowchemy/layouts/partials/comments.html b/wowchemy/layouts/partials/comments.html
index 87cac006..84ed8fd2 100644
--- a/wowchemy/layouts/partials/comments.html
+++ b/wowchemy/layouts/partials/comments.html
@@ -7,9 +7,7 @@
     {{ errorf "The '%s' comment provider was not found." $provider }}
   {{ end }}
 
-  {{ $commentable_page_types := site.Params.comments.commentable | default dict }}
-  {{ $commentable_page_type := index $commentable_page_types .Type | default false }}
-  {{ $commentable_page := (ne .Params.commentable false) | and $commentable_page_type }}
+  {{ $commentable_page := .Params.commentable }}
 
   {{ if $commentable_page }}
   <section id="comments">
diff --git a/wowchemy/layouts/partials/page_metadata.html b/wowchemy/layouts/partials/page_metadata.html
index 6191b1c6..595d4da5 100644
--- a/wowchemy/layouts/partials/page_metadata.html
+++ b/wowchemy/layouts/partials/page_metadata.html
@@ -47,9 +47,7 @@
 
   {{/* Show Disqus comment count if enabled. */}}
   {{ $comments_provider := trim (site.Params.comments.provider | lower) " " }}
-  {{ $commentable_page_types := site.Params.comments.commentable | default dict }}
-  {{ $commentable_page_type := index $commentable_page_types $page.Type | default false }}
-  {{ $commentable_page := (ne $page.Params.commentable false) | and $commentable_page_type }}
+  {{ $commentable_page := $page.Params.commentable }}
   {{ if (eq $comments_provider "disqus") | and (site.Params.comments.disqus.show_count | default true) | and $commentable_page }}
     <span class="middot-divider"></span>
     <a href="{{ $page.RelPermalink }}#disqus_thread"><!-- Count will be inserted here --></a>