Revert ntp source port change and add 'don't die' fix