trying to re-remove spence from ntp module

Change-Id: Iaaaf647ba7b215f0ea59bdf836ff9e8eba11a636
Merge "trying to re-remove spence from ntp module" into production