diff --git a/CHANGES.txt b/CHANGES.txt
index 753803e6580..a7f4d031874 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -50,6 +50,10 @@ Bug Fixes
 
 * SOLR-1569: Allow functions to take in literal strings by modifying the FunctionQParser and adding LiteeralValueSource (gsingers)
 
+* SOLR-1432: Make the new ValueSource.getValues(context,reader) delegate
+  to the original ValueSource.getValues(reader) so custom sources
+  will work. (yonik)
+
 Other Changes
 ----------------------
 
diff --git a/src/java/org/apache/solr/search/function/ValueSource.java b/src/java/org/apache/solr/search/function/ValueSource.java
index 9996dad0030..7862a08a034 100644
--- a/src/java/org/apache/solr/search/function/ValueSource.java
+++ b/src/java/org/apache/solr/search/function/ValueSource.java
@@ -44,7 +44,7 @@ public abstract class ValueSource implements Serializable {
    * passed to createWeight()
    */
   public DocValues getValues(Map context, IndexReader reader) throws IOException {
-    return null;
+    return getValues(reader);
   }
 
   public abstract boolean equals(Object o);