GCP-5599 revert fix to show up in FB bec it wont show up in SB