Reduced diff with upstream.