Revert "[FIX] World time only client side - See #454 [OPTIMIZATION] Removed duplicated code checking for nulls"

This reverts commit 1ef46099e6f3cef9ae4d6ed44849cb2064d16e3c.