Revert "Match up to new gps.h"

This reverts commit 8a7531a7913782ed5ee01571f613f535d6540508.
I have no idea what I was thinking when I did that...