@Brandon I am not sure if the fixed NTP DS is the one now in the repo, I was given it by support after I found the original one broken on various devices.
	@Mosh Yeah, I have been bitten by the DS import many times.  A big problem is the difference display (see recent FR I posted on that).  A simple first pass on this would be to prevent importing a replacement DS if any datapoints would be removed without a force indicator.  That is really a no-brainer and would avoid many problems.  My recommendation earlier is how to handle transformation of one DS to a new DS when the datapoints are basically the same from one to the other, but renamed/reshuffled.  In my experience, there is not nearly enough attention to this sort of thing, which is unfortunate, as data loss is a really bad result in a monitoring solution.