This reverts commit 21eaf66597. Conflicts: engine/shared/library/sharedNetwork/src/shared/NetworkHandler.cpp
21eaf66597