diff --git a/lib/jekyll/page.rb b/lib/jekyll/page.rb
index 2fb899cc..02c6cfae 100644
--- a/lib/jekyll/page.rb
+++ b/lib/jekyll/page.rb
@@ -129,10 +129,10 @@ module Jekyll
     #
     # Returns String rendered page.
     def render(layouts, site_payload)
-      self.output = _renderer.tap do |renderer|
-        renderer.layouts = layouts
-        renderer.payload = site_payload
-      end.run
+      site_payload["page"] = to_liquid
+      site_payload["paginator"] = pager.to_liquid
+
+      do_layout(site_payload, layouts)
     end
 
     # The path to the source file
diff --git a/lib/jekyll/renderer.rb b/lib/jekyll/renderer.rb
index 3a4aedc9..eb1f54ab 100644
--- a/lib/jekyll/renderer.rb
+++ b/lib/jekyll/renderer.rb
@@ -67,8 +67,7 @@ module Jekyll
     # rubocop: disable AbcSize
     def render_document
       info = {
-        :filters   => [Jekyll::Filters],
-        :registers => { :site => site, :page => payload["page"] }
+        :registers => { :site => site, :page => payload["page"] },
       }
       output = document.content
       if document.render_with_liquid?
@@ -169,11 +168,12 @@ module Jekyll
     # Returns nothing
     private
     def validate_layout(layout)
+      return unless invalid_layout?(layout)
       Jekyll.logger.warn(
         "Build Warning:",
         "Layout '#{document.data["layout"]}' requested "\
         "in #{document.relative_path} does not exist."
-      ) if invalid_layout?(layout)
+      )
     end
 
     # Render layout content into document.output
@@ -194,10 +194,11 @@ module Jekyll
 
     private
     def add_regenerator_dependencies(layout)
+      return unless document.write?
       site.regenerator.add_dependency(
         site.in_source_dir(document.path),
         site.in_source_dir(layout.path)
-      ) if document.write?
+      )
     end
 
     # Set page content to payload and assign pager if document has one.