diff --git a/community/common/src/main/java/org/neo4j/kernel/lifecycle/LifeSupport.java b/community/common/src/main/java/org/neo4j/kernel/lifecycle/LifeSupport.java
index 8613972154c8e..f5cbbda22b210 100644
--- a/community/common/src/main/java/org/neo4j/kernel/lifecycle/LifeSupport.java
+++ b/community/common/src/main/java/org/neo4j/kernel/lifecycle/LifeSupport.java
@@ -277,7 +277,7 @@ public synchronized boolean remove( Lifecycle instance )
         return false;
     }
 
-    public Iterable<Lifecycle> getLifecycleInstances()
+    public List<Lifecycle> getLifecycleInstances()
     {
         return instances.stream().map( ( l ) -> l.instance ).collect( toList() );
     }
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/extension/KernelExtensions.java b/community/kernel/src/main/java/org/neo4j/kernel/extension/KernelExtensions.java
index db3841df68170..a4d6123d0205b 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/extension/KernelExtensions.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/extension/KernelExtensions.java
@@ -24,7 +24,6 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import org.neo4j.graphdb.DependencyResolver;
 import org.neo4j.kernel.impl.spi.KernelContext;
@@ -112,7 +111,7 @@ boolean isRegistered( Class<?> kernelExtensionFactoryClass )
     @Override
     public <T> T resolveDependency( final Class<T> type, SelectionStrategy selector ) throws IllegalArgumentException
     {
-        List<T> filteredAndCasted = Stream.of( life.getLifecycleInstances() )
+        List<T> filteredAndCasted = life.getLifecycleInstances().stream()
                 .filter( type::isInstance )
                 .map( type::cast )
                 .collect( Collectors.toList() );