Revert "Nanjou update"

This reverts commit ad5902790a1fa7fedc78b0b60fd03641e5da62da.
KONOYERO