upstream now appears to work just fine