Revert "BUG: Fixed fix for BUG #8494."
Revert "BUG: Fixed fix for BUG #8494."

This reverts commit 5d3b884ffabf5649161f73af1c3e2c616c82c65c.
This commit was causing testHexaPenta to fail. On closer inspection, the
original condition made sense since we don't want to pass scalars only when both
the conditions are true:
* we are clipping by scalar AND
* we are not generating clip-scalars

jmerkow/VTK,arnaudgelas/VTK,gram526/VTK,collects/VTK,mspark93/VTK,candy7393/VTK,sumedhasingla/VTK,biddisco/VTK,daviddoria/PointGraphsPhase1,johnkit/vtk-dev,johnkit/vtk-dev,biddisco/VTK,candy7393/VTK,hendradarwin/VTK,johnkit/vtk-dev,ashray/VTK-EVM,hendradarwin/VTK,Wuteyan/VTK,sankhesh/VTK,berendkleinhaneveld/VTK,spthaolt/VTK,demarle/VTK,Wuteyan/VTK,Wuteyan/VTK,mspark93/VTK,sankhesh/VTK,arnaudgelas/VTK,keithroe/vtkoptix,spthaolt/VTK,cjh1/VTK,jmerkow/VTK,ashray/VTK-EVM,aashish24/VTK-old,jmerkow/VTK,daviddoria/PointGraphsPhase1,keithroe/vtkoptix,candy7393/VTK,hendradarwin/VTK,SimVascular/VTK,berendkleinhaneveld/VTK,spthaolt/VTK,hendradarwin/VTK,SimVascular/VTK,jmerkow/VTK,biddisco/VTK,sumedhasingla/VTK,cjh1/VTK,msmolens/VTK,sumedhasingla/VTK,keithroe/vtkoptix,jmerkow/VTK,biddisco/VTK,mspark93/VTK,sankhesh/VTK,candy7393/VTK,hendradarwin/VTK,naucoin/VTKSlicerWidgets,ashray/VTK-EVM,berendkleinhaneveld/VTK,aashish24/VTK-old,keithroe/vtkoptix,keithroe/vtkoptix,demarle/VTK,cjh1/VTK,Wuteyan/VTK,jeffbaumes/jeffbaumes-vtk,arnaudgelas/VTK,berendkleinhaneveld/VTK,keithroe/vtkoptix,jeffbaumes/jeffbaumes-vtk,cjh1/VTK,msmolens/VTK,jmerkow/VTK,ashray/VTK-EVM,gram526/VTK,daviddoria/PointGraphsPhase1,berendkleinhaneveld/VTK,sumedhasingla/VTK,Wuteyan/VTK,johnkit/vtk-dev,jeffbaumes/jeffbaumes-vtk,mspark93/VTK,gram526/VTK,ashray/VTK-EVM,biddisco/VTK,candy7393/VTK,jeffbaumes/jeffbaumes-vtk,arnaudgelas/VTK,arnaudgelas/VTK,johnkit/vtk-dev,naucoin/VTKSlicerWidgets,demarle/VTK,berendkleinhaneveld/VTK,mspark93/VTK,sumedhasingla/VTK,SimVascular/VTK,gram526/VTK,daviddoria/PointGraphsPhase1,SimVascular/VTK,biddisco/VTK,msmolens/VTK,cjh1/VTK,collects/VTK,hendradarwin/VTK,SimVascular/VTK,sumedhasingla/VTK,jmerkow/VTK,SimVascular/VTK,sankhesh/VTK,candy7393/VTK,collects/VTK,aashish24/VTK-old,sumedhasingla/VTK,arnaudgelas/VTK,spthaolt/VTK,demarle/VTK,keithroe/vtkoptix,msmolens/VTK,msmolens/VTK,gram526/VTK,spthaolt/VTK,biddisco/VTK,gram526/VTK,ashray/VTK-EVM,aashish24/VTK-old,cjh1/VTK,johnkit/vtk-dev,sankhesh/VTK,daviddoria/PointGraphsPhase1,aashish24/VTK-old,berendkleinhaneveld/VTK,aashish24/VTK-old,msmolens/VTK,keithroe/vtkoptix,collects/VTK,sankhesh/VTK,candy7393/VTK,demarle/VTK,mspark93/VTK,daviddoria/PointGraphsPhase1,Wuteyan/VTK,spthaolt/VTK,jmerkow/VTK,jeffbaumes/jeffbaumes-vtk,naucoin/VTKSlicerWidgets,gram526/VTK,mspark93/VTK,johnkit/vtk-dev,msmolens/VTK,sumedhasingla/VTK,msmolens/VTK,collects/VTK,jeffbaumes/jeffbaumes-vtk,spthaolt/VTK,ashray/VTK-EVM,ashray/VTK-EVM,sankhesh/VTK,hendradarwin/VTK,demarle/VTK,demarle/VTK,naucoin/VTKSlicerWidgets,Wuteyan/VTK,SimVascular/VTK,naucoin/VTKSlicerWidgets,gram526/VTK,sankhesh/VTK,demarle/VTK,candy7393/VTK,naucoin/VTKSlicerWidgets,collects/VTK,SimVascular/VTK,mspark93/VTK