Revert "Remove irrelevant arguements from request #6396"

This reverts commit 6c08a17bc3c20f9bf5e41a253ec4ee9a0b2a8c82.