Revert "[SoftwareTools] fix GS"

This reverts commit d3755c0bed16708175900367934fa660a48cd8a2.
[Console] fix GS