Disable datastore checks for now