diff --git a/aqt/main.py b/aqt/main.py
index 7f8b5f846..3f3be99ad 100755
--- a/aqt/main.py
+++ b/aqt/main.py
@@ -805,13 +805,16 @@ Please choose a new deck name:"""))
             ret = _("late")
         else:
             ret = _("early")
-        showWarning(
-            _("The time or date on your computer is not correct.\n") +
-            ngettext("It is %(sec)d second %(type)s.\n",
-                "It is %(sec)d seconds %(type)s.\n", abs(diff))
-                % {"sec": abs(diff), "type": ret} +
-            _(" Please ensure it is set correctly and then restart Anki.")
-         )
+        showWarning("""\
+In order to ensure your collection works correctly when moved between \
+devices, Anki requires the system clock to be set correctly. Your system \
+clock appears to be wrong by more than 5 minutes.
+
+This can be because the \
+clock is slow or fast, because the date is set incorrectly, or because \
+the timezone or daylight savings information is incorrect. Please correct \
+the problem and restart Anki.""")
+        sys.exit(0)
 
     # Schema modifications
     ##########################################################################
diff --git a/aqt/update.py b/aqt/update.py
index 7069b56da..18a4b7b35 100644
--- a/aqt/update.py
+++ b/aqt/update.py
@@ -14,10 +14,8 @@ class LatestVersionFinder(QThread):
 
     def __init__(self, main):
         QThread.__init__(self)
-        print "autoupdate"
-        return
         self.main = main
-        self.config = main.pm.profile
+        self.config = main.pm.meta
         plat=sys.platform
         pver=platform.platform()
         d = {"ver": aqt.appVersion,
@@ -29,8 +27,7 @@ class LatestVersionFinder(QThread):
         self.stats = d
 
     def run(self):
-        return
-        if not self.config['checkForUpdates']:
+        if not self.config['updates']:
             return
         d = self.stats
         d['proto'] = 2