Revert "Require whenever to try and avoid cap fails"

This reverts commit b1dd6fb7bd632a4ff311a13587f52e2c1741d0e9.