Merge #11649: Revert "Remove unused variable in shell script"