Reverted top to Master commits which Drew made so that we can
redo the merge of his branch to master.

Revert "Re-did the controls for the pilot driver."

This reverts commit 4414111ad75649001e0989ccfd05795d35fd50d6.