Revert "Merge branch 'master' of https://github.com/engijs/engi"

This reverts commit 2c33ec8a886995cc8d3d8836f4fa70a9d5ea5a21, reversing
changes made to e79a265e43a51d440d545b41c5542251eb223228.