diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/SpringApplication.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/SpringApplication.java
index 0ea5ccc7a..e05d75298 100644
--- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/SpringApplication.java
+++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/SpringApplication.java
@@ -24,14 +24,12 @@ import java.util.function.Supplier;
 
 import org.springframework.beans.BeanUtils;
 import org.springframework.boot.WebApplicationType;
-import org.springframework.boot.web.reactive.context.ReactiveWebServerApplicationContext;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextInitializer;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.support.GenericApplicationContext;
 import org.springframework.core.env.MapPropertySource;
 import org.springframework.core.env.MutablePropertySources;
-import org.springframework.util.ClassUtils;
 
 /**
  * @author Dave Syer
@@ -61,19 +59,9 @@ public class SpringApplication extends org.springframework.boot.SpringApplicatio
 
 	public SpringApplication(Class<?>... primarySources) {
 		super(primarySources);
-		if (ClassUtils.isPresent("org.springframework.web.reactive.DispatcherHandler",
-				null)) {
-			// prefer reactive if it is present
-			setWebApplicationType(WebApplicationType.REACTIVE);
-		}
-	}
-
-	@Override
-	public ConfigurableApplicationContext run(String... args) {
-		if (getWebApplicationType() == WebApplicationType.REACTIVE) {
-			setApplicationContextClass(ReactiveWebServerApplicationContext.class);
-		}
-		return super.run(args);
+		// Prefer non-web applications, even if a server is on the classpath
+		setWebApplicationType(WebApplicationType.NONE);
+		setApplicationContextClass(GenericApplicationContext.class);
 	}
 
 	@Override
diff --git a/spring-cloud-function-samples/function-sample-aws/pom.xml b/spring-cloud-function-samples/function-sample-aws/pom.xml
index 15cc01dc2..3c1fd4dbd 100644
--- a/spring-cloud-function-samples/function-sample-aws/pom.xml
+++ b/spring-cloud-function-samples/function-sample-aws/pom.xml
@@ -22,9 +22,8 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
-		<wrapper.version>1.0.11.RELEASE</wrapper.version>
+		<wrapper.version>1.0.17.RELEASE</wrapper.version>
 		<aws-lambda-events.version>2.0.2</aws-lambda-events.version>
-		<reactor.version>3.1.2.RELEASE</reactor.version>
 		<spring-cloud-function.version>2.0.0.BUILD-SNAPSHOT</spring-cloud-function.version>
 		<start-class>example.Config</start-class>
 	</properties>
diff --git a/spring-cloud-function-samples/function-sample-aws/src/main/java/example/Config.java b/spring-cloud-function-samples/function-sample-aws/src/main/java/example/Config.java
index a38c0572c..56b471d8d 100644
--- a/spring-cloud-function-samples/function-sample-aws/src/main/java/example/Config.java
+++ b/spring-cloud-function-samples/function-sample-aws/src/main/java/example/Config.java
@@ -18,11 +18,11 @@ package example;
 
 import java.util.function.Function;
 
-import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cloud.function.context.FunctionRegistration;
 import org.springframework.cloud.function.context.FunctionType;
+import org.springframework.cloud.function.context.SpringApplication;
 import org.springframework.context.ApplicationContextInitializer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.support.GenericApplicationContext;