Revert "Unify code to use RequestServicesContainer always"

This reverts commit 46c47546b94ea5d25f9a50f2abe1eb3bba2ec5ed.