Fix ping derp after upstream update