--- a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/runtime/SLFunctionForeignAccess.java	Sat Aug 29 01:34:41 2015 +0200
+++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/runtime/SLFunctionForeignAccess.java	Mon Aug 31 09:01:36 2015 +0200
@@ -41,16 +41,14 @@
 package com.oracle.truffle.sl.runtime;
 
 import com.oracle.truffle.api.*;
-import com.oracle.truffle.api.CompilerDirectives.*;
 import com.oracle.truffle.api.frame.VirtualFrame;
-import com.oracle.truffle.api.nodes.RootNode;
-import com.oracle.truffle.api.interop.TruffleObject;
 import com.oracle.truffle.api.interop.ForeignAccess;
 import com.oracle.truffle.api.interop.Message;
+import com.oracle.truffle.api.interop.TruffleObject;
+import com.oracle.truffle.api.nodes.RootNode;
 import com.oracle.truffle.sl.SLLanguage;
 import com.oracle.truffle.sl.nodes.call.SLDispatchNode;
 import com.oracle.truffle.sl.nodes.call.SLDispatchNodeGen;
-
 import java.math.BigInteger;
 import java.util.List;
 
@@ -58,14 +56,8 @@
  * Implementation of foreign access for {@link SLFunction}.
  */
 final class SLFunctionForeignAccess implements ForeignAccess.Factory {
-    @CompilationFinal private static ForeignAccess singleton;
-
-    public static ForeignAccess getSingleton() {
-        if (singleton == null) {
-            CompilerDirectives.transferToInterpreterAndInvalidate();
-            singleton = ForeignAccess.create(new SLFunctionForeignAccess());
-        }
-        return singleton;
+    public static ForeignAccess create() {
+        return ForeignAccess.create(new SLFunctionForeignAccess());
     }
 
     private SLFunctionForeignAccess() {