This reverts commit d8c133db. Due to parsing bug in luajit, tests were failing. This bug was fixed by 89c5bef0.