Getting rid of an extra passport call.