Index: build/assemble-source-from-google.sh
==================================================================
--- build/assemble-source-from-google.sh
+++ build/assemble-source-from-google.sh
@@ -34,10 +34,17 @@
 
 		# Copy out PC/SC headers for later use
 		mkdir -p "${instdir}/include/PCSC" || exit 1
 		cp third_party/pcsc-lite/src-*/src/PCSC/*.h "${instdir}/include/PCSC" || exit 1
 
+		# Update one of the JavaScript files to provide a better interface
+		sed '
+			s@naclModuleMessageChannel.*opt_serverAppId@&, opt_naclElement@
+			/opt_naclElement/ a \
+if (naclModuleMessageChannel == null && opt_naclElement != null) { naclModuleMessageChannel = new GoogleSmartCard.NaclModuleMessageChannel(opt_naclElement, GoogleSmartCard.Logging.getScopedLogger("NaclModule<>")); }
+		' third_party/pcsc-lite/naclport/cpp_client/src/nacl-client-backend.js
+
 		# Copy out JavaScript files for later use
 		rm -f "${instdir}/libpcsc.js"
 		files=(
 			third_party/closure-library/src-20160208/closure/goog/base.js
 			third_party/closure-library/src-20160208/closure/goog/math/integer.js