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

This reverts commit d5285da4b3188e7564bd0fc96f2a6d74b2c3c9a3, reversing
changes made to c09a8ecc4af8ea0b1699caf5189232e3c3ef3085.
Merge branch 'master' of github.com:punchdrunker/koala