Rawlinson back on track for Berlin