Revert some last changes so that there is no problem with Lua