diff --git a/lib/jekyll/page.rb b/lib/jekyll/page.rb
index 80f5b884..eed47ac3 100644
--- a/lib/jekyll/page.rb
+++ b/lib/jekyll/page.rb
@@ -31,7 +31,6 @@ module Jekyll
     # Returns nothing.
     def read_yaml(base, name)
       super(base, name)
-      self.data['layout'] = 'page' unless self.data.has_key?('layout')
       self.data
     end
 
diff --git a/lib/jekyll/post.rb b/lib/jekyll/post.rb
index 44979309..c210d235 100644
--- a/lib/jekyll/post.rb
+++ b/lib/jekyll/post.rb
@@ -82,7 +82,6 @@ module Jekyll
     def read_yaml(base, name)
       super(base, name)
       self.extracted_excerpt = self.extract_excerpt
-      self.data['layout'] = 'post' unless self.data.has_key?('layout')
     end
 
     # The post excerpt. This is either a custom excerpt