Revert "kikiyo"

This reverts commit 5038c5ade8db73a4a83ebdff2b3ae0b93ad45604.