rc: Reverted NTP code to 2678 as a few users had issues with the newer code, and I can't reproduce the problem