Upgraded from upstream.