Revert "[ja] Sync with d75db4604974a02efd8d2157195ee8003f35258b"

This reverts commit 8041eb1892fe58ca81455b749b6244668df347cf.