Revert "GPS enhancements for D2 family."

This reverts commit d13ed0f042159877ba7aae2db79783fafc6d2247.