Revert "Fix initialization-order-fiasco"

This reverts commit e9510a2.

Author: mwswartwout

src/app/server/Server.cpp

@@ -87,6 +87,8 @@ class DeviceTypeResolver : public chip::Access::AccessControl::DeviceTypeResolve
 
 namespace chip {
 
+Server Server::sServer;
+
 #if CHIP_CONFIG_ENABLE_SERVER_IM_EVENT
 #define CHIP_NUM_EVENT_LOGGING_BUFFERS 3
 static uint8_t sInfoEventBuffer[CHIP_DEVICE_CONFIG_EVENT_LOGGING_INFO_BUFFER_SIZE];

src/app/server/Server.h

@@ -398,14 +398,13 @@ class Server
         return System::SystemClock().GetMonotonicMicroseconds64() - mInitTimestamp;
     }
 
-    static Server & GetInstance() {
-      static Server sServer = new Server();
-      return *sServer;
-    }
+    static Server & GetInstance() { return sServer; }
 
 private:
     Server() {}
 
+    static Server sServer;
+
     void InitFailSafe();
     void OnPlatformEvent(const DeviceLayer::ChipDeviceEvent & event);
     void CheckServerReadyEvent();