Merge "Remove workaround for repo."