Temporary work-aground for --uid issue.