Revert "Merge branch 'master' of github.com:punchdrunker/koala"

This reverts commit 5d3435f8dd115579ffe952bf9d7743e320151f0d, reversing
changes made to 6e09a4f82ef7261ddfdb1845efa4f06bfee8de28.