diff --git a/src/main/java/org/apache/sling/scripting/sightly/impl/engine/SightlyScriptEngine.java b/src/main/java/org/apache/sling/scripting/sightly/impl/engine/SightlyScriptEngine.java
index 9d7d097..1a9fb03 100644
--- a/src/main/java/org/apache/sling/scripting/sightly/impl/engine/SightlyScriptEngine.java
+++ b/src/main/java/org/apache/sling/scripting/sightly/impl/engine/SightlyScriptEngine.java
@@ -138,13 +138,7 @@
             if (scriptContext != null) {
                 renderUnit = scriptContext.getAttribute("precompiled.unit", SlingScriptConstants.SLING_SCOPE);
             }
-            if (renderUnit instanceof Class) {
-                try {
-                    renderUnit = ((Class) renderUnit).getDeclaredConstructor().newInstance();
-                } catch (Exception e) {
-                    throw new ScriptException(e);
-                }
-            } else {
+            if (renderUnit == null) {
                 JavaClassBackendCompiler javaClassBackendCompiler = new JavaClassBackendCompiler(importsAnalyser);
                 GlobalShadowCheckBackendCompiler shadowCheckBackendCompiler = null;
                 if (scriptContext != null) {
