Revert "Merge pull request #1 from Druboo666/kitkat-legacy"

This reverts commit 50b9ea10ff0a4725c56bd3fe551a68e4f223841d, reversing
changes made to 08615e20ef41ab06b6e8bb163fcdf29d37608e39.