Revert "Merge branch 'master' of https://github.com/annaptak/mka2.0"

This reverts commit eec8a0b40f78b16c1d31c98ec77ef35409377ac4, reversing
changes made to 8764d67420c5da7e943820f39a249ad6bc434c13.