Revert "Revert "Fixed Okutama""

This reverts commit 700c407284c8108551033e310b712cff02013fc5.