Pulled from upstream.