ja: Follow upstream change