diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionAroundWrapper.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionAroundWrapper.java
index f9b1a7f59..87694f80d 100644
--- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionAroundWrapper.java
+++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionAroundWrapper.java
@@ -37,12 +37,12 @@ public abstract class FunctionAroundWrapper implements BiFunction<Object, Functi
 	@SuppressWarnings("unchecked")
 	@Override
 	public final Object apply(Object input, FunctionInvocationWrapper targetFunction) {
-//		if (input instanceof Message) {
-//			return this.doApply((Message<byte[]>) input, targetFunction);
-//		}
-//		else if (targetFunction.isSupplier() && !targetFunction.isOutputTypePublisher()) {
-//			return this.doApply(null, targetFunction);
-//		}
+		if (input instanceof Message) {
+			return this.doApply((Message<byte[]>) input, targetFunction);
+		}
+		else if (targetFunction.isSupplier() && !targetFunction.isOutputTypePublisher()) {
+			return this.doApply(null, targetFunction);
+		}
 		return targetFunction.apply(input);
 	}
 
diff --git a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistryTests.java b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistryTests.java
index 09039a6fc..996822c7f 100644
--- a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistryTests.java
+++ b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistryTests.java
@@ -38,7 +38,6 @@ import java.util.stream.Collectors;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.reactivestreams.Publisher;
 import reactor.core.publisher.Flux;
@@ -540,7 +539,6 @@ public class BeanFactoryAwareFunctionRegistryTests {
 
 	@SuppressWarnings({ "rawtypes", "unchecked" })
 	@Test
-	@Disabled
 	public void testWrappedWithAroundAdviseConfiguration() {
 		FunctionCatalog catalog = this.configureCatalog(WrappedWithAroundAdviseConfiguration.class);
 		Function f = catalog.lookup("uppercase");
diff --git a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/MarcinSleuthTests.java b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/MarcinSleuthTests.java
index 69bfd242f..59a07004c 100644
--- a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/MarcinSleuthTests.java
+++ b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/MarcinSleuthTests.java
@@ -19,7 +19,6 @@ package org.springframework.cloud.function.context.catalog;
 import java.util.function.Function;
 
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -37,7 +36,6 @@ import static org.assertj.core.api.Assertions.assertThat;
 /**
  * @author Oleg Zhurakousky
  */
-@Disabled
 public class MarcinSleuthTests {
 
 	private ApplicationContext context;