Revert "Otari"

This reverts commit fb999dcfa8ca1bb0ab4ab2c2aca7130a632576d0.