Revert "Sensor Overhaul"

This reverts commit 2e77b3a17c804cb00a92ca558610bc4c4e0c1522.