Merge "Mixed up uid and user-id."