Update for Simon's from_backend changes.