Fix passthrough value provider deindex.

@bug W-2087500@

@rev eric.anderson@
Merging origin/goliver/master-pending-fix-passthrough into master