07bfe371b4
Previously the parameters were not restored. This commit ensures the parameters are restored. Closes gh-18204 Signed-off-by: Vishnutheep B <vishnutheep@gmail.com>