diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/FilterImpl.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/FilterImpl.java
index 96b87ce..f718ea1 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/FilterImpl.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/FilterImpl.java
@@ -14,10 +14,8 @@
 
 package org.eclipse.osgi.internal.framework;
 
-import static java.lang.invoke.MethodHandles.publicLookup;
 import static java.util.Objects.requireNonNull;
 
-import java.lang.invoke.MethodHandle;
 import java.lang.reflect.AccessibleObject;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
@@ -787,8 +785,7 @@
 				if (Modifier.isStatic(method.getModifiers()) && target.isAssignableFrom(method.getReturnType())) {
 					setAccessible(method);
 					try {
-						MethodHandle mh = publicLookup().unreflect(method);
-						return mh.invoke(value2.trim());
+						return method.invoke(null, value2.trim());
 					} catch (Error e) {
 						throw e;
 					} catch (Throwable e) {
@@ -806,8 +803,7 @@
 				}
 				setAccessible(constructor);
 				try {
-					MethodHandle mh = publicLookup().unreflectConstructor(constructor);
-					return mh.invoke(value2.trim());
+					return constructor.newInstance(value2.trim());
 				} catch (Error e) {
 					throw e;
 				} catch (Throwable e) {
