The nipd branch slowed bootstrap by a minute, this patch does not. sorry about changing the fjsc line endings...