Rollback to old way of handling worlds