Re-trying updating some files from upstream.