Revert "ntp"

This reverts commit 73e8f711e2ba51a0c2645b113a74efbebc3dc09f.
Revert "Revert "ntp""

This reverts commit f16f2efa516cabef312ca0f0fa600ee7cf180845.
Merge remote-tracking branch 'origin/master'