Index: vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/JcrPackageDefinitionImpl.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/JcrPackageDefinitionImpl.java	(revision 1638065)
+++ vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/JcrPackageDefinitionImpl.java	(revision )
@@ -274,7 +274,6 @@
 
         try {
             Node rootNode = session.getNode(rootPath);
-            String defPath = defNode.getPath().substring(1);
 
             Importer importer = new Importer();
             // disable saving
@@ -283,7 +282,7 @@
             importer.run(archive, rootNode);
 
             // refresh defNode if it was replaced during unwrap
-            defNode = session.getRootNode().getNode(defPath);
+            defNode = session.getNode(rootPath);
 
             // set props again
             if (lastUnpacked != null) {
\ No newline at end of file