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