s3: Revert the serverid changes, they need more work