Revert "- Cam2 from storm31"

This reverts commit 5268d2e7ad9479dfa6850b593dd1f0924361c24b.