diff --git a/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/flux/FunctionHandlerMapping.java b/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/flux/FunctionHandlerMapping.java
index 93f89f49f..579bf3aa1 100644
--- a/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/flux/FunctionHandlerMapping.java
+++ b/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/flux/FunctionHandlerMapping.java
@@ -84,7 +84,7 @@ public class FunctionHandlerMapping extends RequestMappingHandlerMapping
 			path = path.substring(this.prefix.length());
 		}
 		Object function = FunctionWebRequestProcessingHelper
-				.findFunction(this.functionProperties, request.getRequest().getMethod(), this.functions, request.getAttributes(), path, new String[] {});
+				.findFunction(this.functionProperties, request.getRequest().getMethod(), this.functions, request.getAttributes(), path);
 
 		if (function != null) {
 			if (this.logger.isDebugEnabled()) {
diff --git a/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/function/FunctionEndpointInitializer.java b/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/function/FunctionEndpointInitializer.java
index 4e2a8b4f0..969ad6ca5 100644
--- a/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/function/FunctionEndpointInitializer.java
+++ b/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/function/FunctionEndpointInitializer.java
@@ -227,9 +227,8 @@ class FunctionEndpointFactory {
 			function = this.functionCatalog.lookup(Function.class, handler);
 		}
 		else {
-			String[] accept = FunctionWebRequestProcessingHelper.acceptContentTypes(request.headers().accept());
 			function = FunctionWebRequestProcessingHelper.findFunction(this.functionProperties, request.method(), functionCatalog, request.attributes(),
-					request.path(), accept);
+					request.path());
 		}
 		return function;
 	}
diff --git a/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/mvc/FunctionHandlerMapping.java b/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/mvc/FunctionHandlerMapping.java
index 0423d9710..bc1cad3eb 100644
--- a/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/mvc/FunctionHandlerMapping.java
+++ b/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/mvc/FunctionHandlerMapping.java
@@ -98,7 +98,7 @@ public class FunctionHandlerMapping extends RequestMappingHandlerMapping
 		}
 
 		Object function = FunctionWebRequestProcessingHelper.findFunction(this.functionProperties, HttpMethod.resolve(request.getMethod()),
-				this.functions, new HttpRequestAttributeDelegate(request), path, new String[] {});
+				this.functions, new HttpRequestAttributeDelegate(request), path);
 		if (function != null) {
 			if (this.logger.isDebugEnabled()) {
 				this.logger.debug("Found function for GET: " + path);
diff --git a/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/util/FunctionWebRequestProcessingHelper.java b/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/util/FunctionWebRequestProcessingHelper.java
index 88ddaa48f..e7ab4bb31 100644
--- a/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/util/FunctionWebRequestProcessingHelper.java
+++ b/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/util/FunctionWebRequestProcessingHelper.java
@@ -24,16 +24,12 @@ import java.util.stream.Collectors;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.reactivestreams.Publisher;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
 import org.springframework.cloud.function.context.FunctionCatalog;
 import org.springframework.cloud.function.context.FunctionProperties;
 import org.springframework.cloud.function.context.catalog.SimpleFunctionRegistry.FunctionInvocationWrapper;
 import org.springframework.cloud.function.web.constants.WebRequestConstants;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
-import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.http.ResponseEntity.BodyBuilder;
 import org.springframework.messaging.Message;
@@ -41,6 +37,9 @@ import org.springframework.messaging.support.MessageBuilder;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
 /**
  * !INTERNAL USE ONLY!
  *
@@ -56,28 +55,15 @@ public final class FunctionWebRequestProcessingHelper {
 	}
 
 	public static FunctionInvocationWrapper findFunction(FunctionProperties functionProperties, HttpMethod method, FunctionCatalog functionCatalog,
-											Map<String, Object> attributes, String path, String[] acceptContentTypes) {
+											Map<String, Object> attributes, String path) {
 		if (method.equals(HttpMethod.GET) || method.equals(HttpMethod.POST)) {
-			return doFindFunction(functionProperties.getDefinition(), method, functionCatalog, attributes, path, acceptContentTypes);
+			return doFindFunction(functionProperties.getDefinition(), method, functionCatalog, attributes, path);
 		}
 		else {
 			throw new IllegalStateException("HTTP method '" + method + "' is not supported;");
 		}
 	}
 
-	public static String[] acceptContentTypes(List<MediaType> acceptHeaders) {
-		String[] acceptContentTypes = new String[] {};
-		if (!CollectionUtils.isEmpty(acceptHeaders)) {
-			acceptContentTypes = acceptHeaders.stream().map(mediaType -> mediaType.toString()).toArray(String[]::new);
-		}
-		else {
-			acceptContentTypes = new String[] {MediaType.APPLICATION_JSON.toString()};
-		}
-
-		acceptContentTypes = new String[] {StringUtils.arrayToCommaDelimitedString(acceptContentTypes)};
-		return new String[] {};
-	}
-
 	public static Object invokeFunction(FunctionInvocationWrapper function, Object input, boolean isMessage) {
 		Object result = function.apply(input);
 		return postProcessResult(result, isMessage);
@@ -159,11 +145,11 @@ public final class FunctionWebRequestProcessingHelper {
 	}
 
 	private static FunctionInvocationWrapper doFindFunction(String functionDefinition, HttpMethod method, FunctionCatalog functionCatalog,
-											Map<String, Object> attributes, String path, String[] acceptContentTypes) {
+											Map<String, Object> attributes, String path) {
 
 		path = path.startsWith("/") ? path.substring(1) : path;
 		if (method.equals(HttpMethod.GET)) {
-			FunctionInvocationWrapper function = functionCatalog.lookup(path, acceptContentTypes);
+			FunctionInvocationWrapper function = functionCatalog.lookup(path);
 			if (function != null && function.isSupplier()) {
 				attributes.put(WebRequestConstants.SUPPLIER, function);
 				return function;
@@ -181,14 +167,14 @@ public final class FunctionWebRequestProcessingHelper {
 			name = builder.toString();
 			value = path.length() > name.length() ? path.substring(name.length() + 1)
 					: null;
-			FunctionInvocationWrapper function = functionCatalog.lookup(name, acceptContentTypes);
+			FunctionInvocationWrapper function = functionCatalog.lookup(name);
 			if (function != null) {
 				return postProcessFunction(function, value, attributes);
 			}
 		}
 
 		if (StringUtils.hasText(functionDefinition)) {
-			FunctionInvocationWrapper function = functionCatalog.lookup(functionDefinition, acceptContentTypes);
+			FunctionInvocationWrapper function = functionCatalog.lookup(functionDefinition);
 			if (function != null) {
 				return postProcessFunction(function, value, attributes);
 			}