--- bumblebee-3.2.1/conf/xorg.conf.nvidia
+++ bumblebee-3.2.1/conf/xorg.conf.nvidia
@@ -29,6 +29,5 @@ Section "Device"
     Option "ProbeAllGpus" "false"
 
     Option "NoLogo" "true"
-    Option "UseEDID" "false"
-    Option "UseDisplayDevice" "none"
+@deviceOptions@
 EndSection