Merge "Remove the workaround" into rvc-dev