Derby defender James O'Connor has returned to the Midlands club after training with Bristol City last week.