Revert "Revert "Bring in Vigor""

This reverts commit 08cebb8e624439677e991ba995973e2f14e1286d.