OData services nextLink not correct when using $skip, $top or $orderby

[dstomphorst]

The OData service generates an invalid odata.nextLink.

When calling for example: http://autohaus/odata/Cars?$inlinecount=allpages&$filter=BodyType%20eq%20'convertible'&$skip=40

The next link is: http://autohaus/odata/Cars?$inlinecount=allpages&$filter=BodyType%20eq%20'convertible'&$skip=20

The $skip parameter is incorrect.

This is probably because $skip, $top and $orderby are removed by the BuildCustomRequest method and therefore not used when rendering the nextLink.