Code cleanups for direct RequestDispatcher access
Revert "Code cleanups for direct RequestDispatcher access"

This reverts commit 1ff665f76ac38faaa8831191b6b4be89fc1b2acf.
Code cleanups for direct RequestDispatcher access