removed as many usage of the request service as possible without breaking BC