Merge "Removing old workaround" into main