diff --git a/Yesod/Yesod.hs b/Yesod/Yesod.hs
index 166728dc..a0b4d56f 100644
--- a/Yesod/Yesod.hs
+++ b/Yesod/Yesod.hs
@@ -63,11 +63,8 @@ class YesodSite a => Yesod a where
     errorHandler _ = defaultErrorHandler
 
     -- | Applies some form of layout to the contents of a page.
-    defaultLayout :: a
-                  -> PageContent (Routes a)
-                  -> Request
-                  -> Hamlet (Routes a) IO ()
-    defaultLayout _ p _ = [$hamlet|
+    defaultLayout :: PageContent (Routes a) -> GHandler sub a Content
+    defaultLayout p = hamletToContent $ [$hamlet|
 !!!
 %html
     %head
@@ -86,16 +83,12 @@ applyLayout :: Yesod master
             => String -- ^ title
             -> Hamlet (Routes master) IO () -- ^ body
             -> GHandler sub master RepHtml
-applyLayout t b = do
-    let pc = PageContent
+applyLayout t b =
+    RepHtml `fmap` defaultLayout PageContent
                 { pageTitle = cs t
                 , pageHead = return ()
                 , pageBody = b
                 }
-    y <- getYesodMaster
-    rr <- getRequest
-    content <- hamletToContent $ defaultLayout y pc rr
-    return $ RepHtml content
 
 -- | Provide both an HTML and JSON representation for a piece of data, using
 -- the default layout for the HTML output ('defaultLayout').
@@ -106,14 +99,11 @@ applyLayoutJson :: Yesod master
                 -> (x -> Json (Routes master) ())
                 -> GHandler sub master RepHtmlJson
 applyLayoutJson t x toH toJ = do
-    let pc = PageContent
+    html <- defaultLayout PageContent
                 { pageTitle = cs t
                 , pageHead = return ()
                 , pageBody = toH x
                 }
-    y <- getYesodMaster
-    rr <- getRequest
-    html <- hamletToContent $ defaultLayout y pc rr
     json <- jsonToContent $ toJ x
     return $ RepHtmlJson html json
 
diff --git a/haddock.sh b/haddock.sh
index 63fea4b2..337c58c7 100755
--- a/haddock.sh
+++ b/haddock.sh
@@ -1,2 +1,2 @@
 cabal haddock --hyperlink-source --html-location='http://hackage.haskell.org/packages/archive//latest/doc/html'
-scp -r dist/doc/html/ snoyberg_yesoddocs@ssh.phx.nearlyfreespeech.net:/home/public/haddock
+scp -r dist/doc/html/yesod snoyberg_yesoddocs@ssh.phx.nearlyfreespeech.net:/home/public/haddock/