Comment 4 for bug 1479652

Ready in ~hart/ntp-dev-2174