Revert "Removed use_xforward:true"

This reverts commit 36c4fc9707566ceab05faa36f8c30cf083c58cde.