Final Sprint 2 v2
Revert "Final Sprint 2 v2"

This reverts commit e4c1fc9fd5910eab49b6de6438296d76d97c129a.