diff --git a/src/_begin.js b/src/_begin.js
index b7759d820..e0f4c36e2 100644
--- a/src/_begin.js
+++ b/src/_begin.js
@@ -21,5 +21,4 @@ along with Video.js.  If not, see <http://www.gnu.org/licenses/>.
 
 // Self-executing function to prevent global vars and help with minification
 ;(function(window, undefined){
-  var document = window.document,
-      CDN_VERSION = "GENERATED_CDN_VSN";
\ No newline at end of file
+  var document = window.document;
\ No newline at end of file
diff --git a/src/_end.js b/src/_end.js
index 3b207b034..38b22840a 100644
--- a/src/_end.js
+++ b/src/_end.js
@@ -2,8 +2,5 @@
 // Expose to global
 window.VideoJS = window._V_ = VideoJS;
 
-// Run Auto-load players
-_V_.autoSetup();
-
 // End self-executing function
 })(window);
\ No newline at end of file
diff --git a/src/core.js b/src/core.js
index b00ebd051..7d23fe1a2 100644
--- a/src/core.js
+++ b/src/core.js
@@ -38,7 +38,10 @@ var VideoJS = function(id, addOptions, ready){
 },
 
 // Shortcut
-_V_ = VideoJS;
+_V_ = VideoJS,
+
+// CDN Version. Used to target right flash swf.
+CDN_VERSION = "GENERATED_CDN_VSN";
 
 VideoJS.players = {};
 
diff --git a/src/setup.js b/src/setup.js
index 1d1cdaf20..f8575c43d 100644
--- a/src/setup.js
+++ b/src/setup.js
@@ -1,4 +1,6 @@
 _V_.addEvent(window, "load", function(){
   _V_.windowLoaded = true;
 });
-_V_.autoSetupTimeout();
\ No newline at end of file
+
+// Run Auto-load players
+_V_.autoSetup();
\ No newline at end of file