#2225 Reverted parts of r10435 since the generic VRPInstanceProvider work accordingly after recent changes.