Revert "revert last changes on GACNST"

This reverts commit fafdf021e55f83c243c270076d51f719eff38da1.