Revert ToxSingleton changes