Revert "Finish fixing validDerivPred change"

This reverts commit 040ad38d2aeb7957cad83731bae03cdcdb5cd664.