Revert "Bring in Vigor"

This reverts commit cf2299933d7b7b8035c95eb6b36b368b85e25dfc.