diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/BuilderBasedDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/BuilderBasedDeserializer.java
index 25ac8ea31cc..eee0077f50a 100644
--- a/src/main/java/com/fasterxml/jackson/databind/deser/BuilderBasedDeserializer.java
+++ b/src/main/java/com/fasterxml/jackson/databind/deser/BuilderBasedDeserializer.java
@@ -506,7 +506,7 @@ protected final Object _deserialize(JsonParser p,
                 return _handleUnexpectedWithin(p, ctxt, builder);
             }
             p.nextToken();
-            handleUnknownVanilla(p, ctxt, handledType(), p.currentName());
+            handleUnknownVanilla(p, ctxt, builder, p.currentName());
         }
     }
 
diff --git a/src/test/java/com/fasterxml/jackson/databind/deser/builder/BuilderSimpleTest.java b/src/test/java/com/fasterxml/jackson/databind/deser/builder/BuilderSimpleTest.java
index aeeb651b903..6b6979d34b1 100644
--- a/src/test/java/com/fasterxml/jackson/databind/deser/builder/BuilderSimpleTest.java
+++ b/src/test/java/com/fasterxml/jackson/databind/deser/builder/BuilderSimpleTest.java
@@ -217,9 +217,9 @@ static class ValueBuilder822
         public int x;
         private Map<String,Object> stuff = new HashMap<String,Object>();
         
-        public ValueBuilder822 withX(int x0) {
+        @JsonCreator
+        public ValueBuilder822(@JsonProperty("x") int x0) {
             this.x = x0;
-            return this;
         }
 
         @JsonAnySetter