These changes were causing failures in vtkInfovisBoostGraphAlgorithms.
This reverts commit 9e9f0ab7, reversing changes made to 51c49664.