Revert "Merge branch 'ZSTAC-42323' into 'master'"
Revert "Merge branch 'ZSTAC-42323' into 'master'"

This reverts merge request !1712
zstackio/zstack-utility,zstackio/zstack-utility,zstackio/zstack-utility