Now that RequestStream is not used by the providers, partially rever #562 so RequestStream is as bare as possible