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
diff --git a/test/test_page.rb b/test/test_page.rb
index 58e7b1fa..db822405 100644
--- a/test/test_page.rb
+++ b/test/test_page.rb
@@ -102,16 +102,6 @@ class TestPage < Test::Unit::TestCase
         assert_equal "/about/", @page.dir
       end
     end
-    
-    context "with unspecified layout" do
-      setup do
-        @page = setup_page('contacts.html')
-      end
-
-      should "default to 'post' layout" do
-        assert_equal "page", @page.data["layout"]
-      end
-    end
         
     context "with specified layout of nil" do
       setup do
diff --git a/test/test_post.rb b/test/test_post.rb
index e57c7c6a..9fe29100 100644
--- a/test/test_post.rb
+++ b/test/test_post.rb
@@ -95,7 +95,7 @@ class TestPost < Test::Unit::TestCase
         should "consume the embedded dashes" do
           @post.read_yaml(@source, @real_file)
 
-          assert_equal({"title" => "Foo --- Bar", "layout" => "post"}, @post.data)
+          assert_equal({"title" => "Foo --- Bar"}, @post.data)
           assert_equal "Triple the fun!", @post.content
         end
       end
@@ -139,18 +139,6 @@ class TestPost < Test::Unit::TestCase
             assert_equal "/2013/2008/09/09/foo-bar.html", @post.url
           end
         end
-
-        context "with unspecified layout" do
-          setup do
-            file = '2013-01-12-no-layout.textile'
-            @post = setup_post(file)
-            @post.process(file)
-          end
-
-          should "default to 'post' layout" do
-            assert_equal "post", @post.data["layout"]
-          end
-        end
         
         context "with specified layout of nil" do
           setup do