Remove differences with upstream.