Revert hacky world loading