Merge "Revert "Removing old workaround"" into sc-v2-dev