diff --git a/lib/layouts/beamer.layout b/lib/layouts/beamer.layout
index cdc379e53d..8b9f1b2f69 100644
--- a/lib/layouts/beamer.layout
+++ b/lib/layouts/beamer.layout
@@ -554,7 +554,6 @@ Style Frame
 	Example,Examples,Fact,Lemma,Proof,Theorem,LyX-Code
   EndAutoNests
   NeedCProtect    -1
-  NoPassThruChars  "%#"
 End
 
 Style PlainFrame
@@ -578,7 +577,6 @@ Style FragileFrame
     PresetArg       "fragile"
   EndArgument
   NeedCProtect      0
-  NoPassThruChars   ""
 End
 
 Style AgainFrame
diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index f4a02ca4e5..6dea0a44e7 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -1882,7 +1882,8 @@ Buffer::ExportStatus Buffer::writeLaTeXSource(otexstream & os,
 	// This is only set once per document (in master)
 	if (!runparams.is_child) {
 		runparams.use_polyglossia = features.usePolyglossia();
-		runparams.use_hyperref = features.isRequired("hyperref");
+		runparams.use_hyperref = features.isRequired("hyperref")
+				|| features.isProvided("hyperref");
 		runparams.use_CJK = features.mustProvide("CJK");
 	}
 	LYXERR(Debug::OUTFILE, "  Buffer validation done.");
@@ -4208,7 +4209,8 @@ unique_ptr<TexRow> Buffer::getSourceCode(odocstream & os, string const & format,
 			validate(features);
 			runparams.use_polyglossia = features.usePolyglossia();
 			runparams.use_babel = features.useBabel();
-			runparams.use_hyperref = features.isRequired("hyperref");
+			runparams.use_hyperref = features.isRequired("hyperref")
+				|| features.isProvided("hyperref");
 			// latex or literate
 			otexstream ots(os);
 			// output above