Revert "Revert "Fixed broken forwardRequest""

This reverts commit 4b0769a401757fefa02e968c072bffe1dce454c4.