Align with upstream.