Revert "Merge branch 'master' into car_logic"

This reverts commit 5597024ee710d6380329caa88e43eab71041d77c, reversing
changes made to a6c07a977a9723ec5515b353b15ac0f2dee37010.