diff --git a/src/printer.js b/src/printer.js
index 906c28e6bd430ac2c3f11b3cd23b165eb9f8bbe1..bd0cca04f15645cd4c09c98ce7e2c3f3b5d848a0 100644
--- a/src/printer.js
+++ b/src/printer.js
@@ -192,7 +192,7 @@ class Printer extends EventEmitter {
     let settings = {
       printBackground: true,
       displayHeaderFooter: false,
-//      preferCSSPageSize: options.width ? false : true, // does not currently work with bleeds: needs to be calculated from the document
+      preferCSSPageSize: options.width ? false : true,
       width: options.width,
       height: options.height,
       orientation: options.orientation,
@@ -204,20 +204,6 @@ class Printer extends EventEmitter {
       }
     }
 
-    if (!options.width) { // calculate paper size from the first page's dimensions
-      await page.exposeFunction('setWidthHeight', (width, height) => {
-        settings.width = `${width}mm`;
-        settings.height = `${height}mm`;
-      });
-      await page.evaluate(() => {
-        const rect = document.querySelector('.pagedjs_page').getBoundingClientRect();
-        setWidthHeight(
-          Math.round(CSS.px(rect.width).to('mm').value),
-          Math.round(CSS.px(rect.height).to('mm').value)
-        );
-      });
-    }
-
     let pdf = await page.pdf(settings)
       .catch((e) => {
         console.error(e);