Double-commit to preserve index on sync