diff --git a/chrome/content/zotero/xpcom/rdf/init.js b/chrome/content/zotero/xpcom/rdf/init.js
index 8cc4750d18..88355c89d6 100644
--- a/chrome/content/zotero/xpcom/rdf/init.js
+++ b/chrome/content/zotero/xpcom/rdf/init.js
@@ -29,8 +29,8 @@ var $rdf = {
 	alert: Zotero.debug
 };
 
-if(!Zotero.RDF) {	// For connector
+if(Zotero.RDF) {
+	Zotero.RDF.AJAW = $rdf;
+} else {
 	Zotero.RDF = {AJAW:$rdf};
-} else {			// For extension
-	Zotero.RDF.AJAW.$rdf = $rdf;
 }
\ No newline at end of file
diff --git a/components/zotero-service.js b/components/zotero-service.js
index 768ac80468..7dc14b44fb 100644
--- a/components/zotero-service.js
+++ b/components/zotero-service.js
@@ -243,11 +243,11 @@ function makeZoteroContext(isConnector) {
 		'rdf/rdfparser',
 		'rdf/serialize'
 	];
-	zContext.Zotero.RDF = {AJAW:{Zotero:zContext.Zotero}};
+	zContext.Zotero.RDF = {Zotero:zContext.Zotero};
 	for (var i=0; i<rdfXpcomFiles.length; i++) {
 		Cc["@mozilla.org/moz/jssubscript-loader;1"]
 			.getService(Ci.mozIJSSubScriptLoader)
-			.loadSubScript("chrome://zotero/content/xpcom/" + rdfXpcomFiles[i] + ".js", zContext.Zotero.RDF.AJAW);
+			.loadSubScript("chrome://zotero/content/xpcom/" + rdfXpcomFiles[i] + ".js", zContext.Zotero.RDF);
 	}
 	
 	if(isStandalone()) {