Import from the correct location
Missed one name change.
Merge remote-tracking branch 'upstream/master'
Had to move the parameter conversion.

Had to move the parameter conversion, since it was needed for setting
permanent_id.