diff --git a/src/lua/LuaComponent.cpp b/src/lua/LuaComponent.cpp
index 9edad894e..65293f3a8 100644
--- a/src/lua/LuaComponent.cpp
+++ b/src/lua/LuaComponent.cpp
@@ -18,10 +18,7 @@ LuaComponent::LuaComponent(lua_State * l) : component(nullptr), owner_ref(LUA_RE
 {
 	this->l = l; // I don't get how this doesn't cause crashes later on
 	
-	lua_pushliteral(l, "Luacon_ci");
-	lua_gettable(l, LUA_REGISTRYINDEX);
-	ci = (LuaScriptInterface*)lua_touserdata(l, -1);
-	lua_pop(l, 1);
+	ci = static_cast<LuaScriptInterface *>(commandInterface);
 }
 
 int LuaComponent::position(lua_State * l)
diff --git a/src/lua/LuaScriptInterface.cpp b/src/lua/LuaScriptInterface.cpp
index c9088e1fb..8251f8990 100644
--- a/src/lua/LuaScriptInterface.cpp
+++ b/src/lua/LuaScriptInterface.cpp
@@ -297,10 +297,6 @@ LuaScriptInterface::LuaScriptInterface(GameController * c, GameModel * m):
 	luaopen_bit(l);
 	lua_pop(l, 1);
 
-	lua_pushliteral(l, "Luacon_ci");
-	lua_pushlightuserdata(l, this);
-	lua_settable(l, LUA_REGISTRYINDEX);
-
 	initSimulationAPI();
 	initInterfaceAPI();
 	SetWindow(c->GetView());
diff --git a/src/lua/LuaWindow.cpp b/src/lua/LuaWindow.cpp
index b24e0c450..3fec7cd7f 100644
--- a/src/lua/LuaWindow.cpp
+++ b/src/lua/LuaWindow.cpp
@@ -53,10 +53,7 @@ LuaWindow::LuaWindow(lua_State * l)
 	if (sizeY < 10)
 		sizeY = 10;
 
-	lua_pushliteral(l, "Luacon_ci");
-	lua_gettable(l, LUA_REGISTRYINDEX);
-	ci = (LuaScriptInterface*)lua_touserdata(l, -1);
-	lua_pop(l, 1);
+	ci = static_cast<LuaScriptInterface *>(commandInterface);
 
 	class DrawnWindow : public ui::Window
 	{