Revert "Revert "Merge commit: fix timer overflows""

This reverts commit e98e0f52e50d004627bd59f9ff08024da070f982.
Revert "MPLAB horribleness"

accidentally reverted the wrong commit before, meant to revert this one.