Cleaned up the fallout from cherrypicking a recent commit to branch summer-robot that fixed drivetrain timing issues.