Revert to master for easier merge

src/core/core_timing.h

@@ -254,13 +254,12 @@ public:
      */
     TimingEventType* RegisterEvent(const std::string& name, TimedCallback callback);
 
+    // Make sure to use thread_safe_mode = true if called from a different thread than the
+    // emulator thread, such as coroutines.
     void ScheduleEvent(s64 cycles_into_future, const TimingEventType* event_type,
                        std::uintptr_t user_data = 0,
-                       std::size_t core_id = std::numeric_limits<std::size_t>::max());
-
-    void ScheduleEventTS(s64 cycles_into_future, const TimingEventType* event_type,
-                         std::uintptr_t user_data = 0,
-                         std::size_t core_id = std::numeric_limits<std::size_t>::max());
+                       std::size_t core_id = std::numeric_limits<std::size_t>::max(),
+                       bool thread_safe_mode = false);
 
     void UnscheduleEvent(const TimingEventType* event_type, std::uintptr_t user_data);
 
@@ -303,13 +302,7 @@ private:
     void serialize(Archive& ar, const unsigned int file_version) {
         // event_types set during initialization of other things
         ar& timers;
-        if (file_version == 0) {
-            std::shared_ptr<Timer> x;
-            ar& x;
-            current_timer = x.get();
-        } else {
-            ar& current_timer;
-        }
+        ar& current_timer;
         if (Archive::is_loading::value) {
             event_queue_locked = true;
         }