Revert "simplification and battle tested version of okami"

This reverts commit fe4b66762d08942583479538f9b81eaa9c193be8.