diff --git a/ui/index.jsp b/ui/index.jsp
index aa20dbf5aa6..19c2dbf0490 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -1762,73 +1762,73 @@
         <!-- jquery.tokeninput.js -->
         <script src="lib/jquery.tokeninput.js" type="text/javascript"></script>
         <!-- CloudStack -->
-        <script type="text/javascript" src="scripts/ui/core.js?t=<%=now%>"></script>
-        <script type="text/javascript" src="scripts/ui/utils.js?t=<%=now%>"></script>
-        <script type="text/javascript" src="scripts/ui/events.js?t=<%=now%>"></script>
-        <script type="text/javascript" src="scripts/ui/dialog.js?t=<%=now%>"></script>
+        <script type="text/javascript" src="scripts/ui/core.js"></script>
+        <script type="text/javascript" src="scripts/ui/utils.js"></script>
+        <script type="text/javascript" src="scripts/ui/events.js"></script>
+        <script type="text/javascript" src="scripts/ui/dialog.js"></script>
 
-        <script type="text/javascript" src="scripts/ui/widgets/multiEdit.js?t=<%=now%>"></script>
-        <script type="text/javascript" src="scripts/ui/widgets/overlay.js?t=<%=now%>"></script>
-        <script type="text/javascript" src="scripts/ui/widgets/dataTable.js?t=<%=now%>"></script>
-        <script type="text/javascript" src="scripts/ui/widgets/cloudBrowser.js?t=<%=now%>"></script>
-        <script type="text/javascript" src="scripts/ui/widgets/listView.js?t=<%=now%>"></script>
-        <script type="text/javascript" src="scripts/ui/widgets/detailView.js?t=<%=now%>"></script>
-        <script type="text/javascript" src="scripts/ui/widgets/treeView.js?t=<%=now%>"></script>
-        <script type="text/javascript" src="scripts/ui/widgets/notifications.js?t=<%=now%>"></script>
-        <script type="text/javascript" src="scripts/ui/widgets/tagger.js?t=<%=now%>"></script>
-        <script type="text/javascript" src="scripts/ui/widgets/toolTip.js?t=<%=now%>"></script>
-        <script type="text/javascript" src="scripts/cloud.core.callbacks.js?t=<%=now%>"></script>
-        <script type="text/javascript" src="scripts/sharedFunctions.js?t=<%=now%>"></script>
-        <script type="text/javascript" src="scripts/ui-custom/login.js?t=<%=now%>"></script>
-        <script type="text/javascript" src="scripts/ui-custom/projects.js?t=<%=now%>"></script>
-        <script type="text/javascript" src="scripts/cloudStack.js?t=<%=now%>"></script>
-        <script type="text/javascript" src="scripts/lbStickyPolicy.js?t=<%=now%>"></script>
-        <script type="text/javascript" src="scripts/ui-custom/autoscaler.js?t=<%=now%>"></script>
-        <script type="text/javascript" src="scripts/ui-custom/healthCheck.js?t=<%=now%>"></script>
-        <script type="text/javascript" src="scripts/autoscaler.js?t=<%=now%>"></script>
-        <script type="text/javascript" src="scripts/ui-custom/granularSettings.js?t=<%=now%>"></script>
-        <script type="text/javascript" src="scripts/ui-custom/zoneChart.js?t=<%=now%>"></script>
-        <script type="text/javascript" src="scripts/ui-custom/dashboard.js?t=<%=now%>"></script>
-        <script type="text/javascript" src="scripts/installWizard.js?t=<%=now%>"></script>
-        <script type="text/javascript" src="scripts/ui-custom/installWizard.js?t=<%=now%>"></script>
-        <script type="text/javascript" src="scripts/projects.js?t=<%=now%>"></script>
-        <script type="text/javascript" src="scripts/dashboard.js?t=<%=now%>"></script>
-        <script type="text/javascript" src="scripts/ui-custom/instanceWizard.js?t=<%=now%>"></script>
-        <script type="text/javascript" src="scripts/instanceWizard.js?t=<%=now%>"></script>
-        <script type="text/javascript" src="scripts/affinity.js?t=<%=now%>"></script>
-        <script type="text/javascript" src="scripts/ui-custom/affinity.js?t=<%=now%>"></script>
-        <script type="text/javascript" src="scripts/instances.js?t=<%=now%>"></script>
-        <script type="text/javascript" src="scripts/events.js?t=<%=now%>"></script>
-        <script type="text/javascript" src="scripts/regions.js?t=<%=now%>"></script>
-        <script type="text/javascript" src="scripts/ui-custom/regions.js?t=<%=now%>"></script>
-        <script type="text/javascript" src="scripts/ui-custom/ipRules.js?t=<%=now%>"></script>
-        <script type="text/javascript" src="scripts/ui-custom/enableStaticNAT.js?t=<%=now%>"></script>
-        <script type="text/javascript" src="scripts/ui-custom/securityRules.js?t=<%=now%>"></script>
-        <script type="text/javascript" src="scripts/ui-custom/vpc.js?t=<%=now%>"></script>
-        <script type="text/javascript" src="scripts/vpc.js?t=<%=now%>"></script>
-        <script type="text/javascript" src="scripts/network.js?t=<%=now%>"></script>
-        <script type="text/javascript" src="scripts/ui-custom/recurringSnapshots.js?t=<%=now%>"></script>
-        <script type="text/javascript" src="scripts/ui-custom/uploadVolume.js?t=<%=now%>"></script>
-        <script type="text/javascript" src="scripts/storage.js?t=<%=now%>"></script>
-        <script type="text/javascript" src="scripts/templates.js?t=<%=now%>"></script>
-        <script type="text/javascript" src="scripts/accountsWizard.js?t=<%=now%>"></script>
-        <script type="text/javascript" src="scripts/ui-custom/accountsWizard.js?t=<%=now%>"></script>
-        <script type="text/javascript" src="scripts/accounts.js?t=<%=now%>"></script>
-        <script type="text/javascript" src="scripts/configuration.js?t=<%=now%>"></script>
-        <script type="text/javascript" src="scripts/globalSettings.js?t=<%=now%>"></script>
-        <script type="text/javascript" src="scripts/zoneWizard.js?t=<%=now%>"></script>
-        <script type="text/javascript" src="scripts/ui-custom/physicalResources.js?t=<%=now%>"></script>
-        <script type="text/javascript" src="scripts/ui-custom/zoneWizard.js?t=<%=now%>"></script>
-        <script type="text/javascript" src="scripts/system.js?t=<%=now%>"></script>
-        <script type="text/javascript" src="scripts/domains.js?t=<%=now%>"></script>
-        <script type="text/javascript" src="scripts/docs.js?t=<%=now%>"></script>
-        <script type="text/javascript" src="scripts/vm_snapshots.js?t=<%=now%>"></script>
-        <script type="text/javascript" src="scripts/ui-custom/projectSelect.js?t=<%=now%>"></script>
+        <script type="text/javascript" src="scripts/ui/widgets/multiEdit.js"></script>
+        <script type="text/javascript" src="scripts/ui/widgets/overlay.js"></script>
+        <script type="text/javascript" src="scripts/ui/widgets/dataTable.js"></script>
+        <script type="text/javascript" src="scripts/ui/widgets/cloudBrowser.js"></script>
+        <script type="text/javascript" src="scripts/ui/widgets/listView.js"></script>
+        <script type="text/javascript" src="scripts/ui/widgets/detailView.js"></script>
+        <script type="text/javascript" src="scripts/ui/widgets/treeView.js"></script>
+        <script type="text/javascript" src="scripts/ui/widgets/notifications.js"></script>
+        <script type="text/javascript" src="scripts/ui/widgets/tagger.js"></script>
+        <script type="text/javascript" src="scripts/ui/widgets/toolTip.js"></script>
+        <script type="text/javascript" src="scripts/cloud.core.callbacks.js"></script>
+        <script type="text/javascript" src="scripts/sharedFunctions.js"></script>
+        <script type="text/javascript" src="scripts/ui-custom/login.js"></script>
+        <script type="text/javascript" src="scripts/ui-custom/projects.js"></script>
+        <script type="text/javascript" src="scripts/cloudStack.js"></script>
+        <script type="text/javascript" src="scripts/lbStickyPolicy.js"></script>
+        <script type="text/javascript" src="scripts/ui-custom/autoscaler.js"></script>
+        <script type="text/javascript" src="scripts/ui-custom/healthCheck.js"></script>
+        <script type="text/javascript" src="scripts/autoscaler.js"></script>
+        <script type="text/javascript" src="scripts/ui-custom/granularSettings.js"></script>
+        <script type="text/javascript" src="scripts/ui-custom/zoneChart.js"></script>
+        <script type="text/javascript" src="scripts/ui-custom/dashboard.js"></script>
+        <script type="text/javascript" src="scripts/installWizard.js"></script>
+        <script type="text/javascript" src="scripts/ui-custom/installWizard.js"></script>
+        <script type="text/javascript" src="scripts/projects.js"></script>
+        <script type="text/javascript" src="scripts/dashboard.js"></script>
+        <script type="text/javascript" src="scripts/ui-custom/instanceWizard.js"></script>
+        <script type="text/javascript" src="scripts/instanceWizard.js"></script>
+        <script type="text/javascript" src="scripts/affinity.js"></script>
+        <script type="text/javascript" src="scripts/ui-custom/affinity.js"></script>
+        <script type="text/javascript" src="scripts/instances.js"></script>
+        <script type="text/javascript" src="scripts/events.js"></script>
+        <script type="text/javascript" src="scripts/regions.js"></script>
+        <script type="text/javascript" src="scripts/ui-custom/regions.js"></script>
+        <script type="text/javascript" src="scripts/ui-custom/ipRules.js"></script>
+        <script type="text/javascript" src="scripts/ui-custom/enableStaticNAT.js"></script>
+        <script type="text/javascript" src="scripts/ui-custom/securityRules.js"></script>
+        <script type="text/javascript" src="scripts/ui-custom/vpc.js"></script>
+        <script type="text/javascript" src="scripts/vpc.js"></script>
+        <script type="text/javascript" src="scripts/network.js"></script>
+        <script type="text/javascript" src="scripts/ui-custom/recurringSnapshots.js"></script>
+        <script type="text/javascript" src="scripts/ui-custom/uploadVolume.js"></script>
+        <script type="text/javascript" src="scripts/storage.js"></script>
+        <script type="text/javascript" src="scripts/templates.js"></script>
+        <script type="text/javascript" src="scripts/accountsWizard.js"></script>
+        <script type="text/javascript" src="scripts/ui-custom/accountsWizard.js"></script>
+        <script type="text/javascript" src="scripts/accounts.js"></script>
+        <script type="text/javascript" src="scripts/configuration.js"></script>
+        <script type="text/javascript" src="scripts/globalSettings.js"></script>
+        <script type="text/javascript" src="scripts/zoneWizard.js"></script>
+        <script type="text/javascript" src="scripts/ui-custom/physicalResources.js"></script>
+        <script type="text/javascript" src="scripts/ui-custom/zoneWizard.js"></script>
+        <script type="text/javascript" src="scripts/system.js"></script>
+        <script type="text/javascript" src="scripts/domains.js"></script>
+        <script type="text/javascript" src="scripts/docs.js"></script>
+        <script type="text/javascript" src="scripts/vm_snapshots.js"></script>
+        <script type="text/javascript" src="scripts/ui-custom/projectSelect.js"></script>
 
         <!-- Plugin/module API -->
-        <script type="text/javascript" src="scripts/ui-custom/pluginListing.js?t=<%=now%>"></script>
-        <script type="text/javascript" src="plugins/plugins.js?t=<%=now%>"></script>
-        <script type="text/javascript" src="modules/modules.js?t=<%=now%>"></script>
-        <script type="text/javascript" src="scripts/plugins.js?t=<%=now%>"></script>
+        <script type="text/javascript" src="scripts/ui-custom/pluginListing.js"></script>
+        <script type="text/javascript" src="plugins/plugins.js"></script>
+        <script type="text/javascript" src="modules/modules.js"></script>
+        <script type="text/javascript" src="scripts/plugins.js"></script>
     </body>
 </html>