Revert "Sync from Teleop"

This reverts commit 54c5f882faba164f13ed662bfaa5c23627a7f239.