Porting parallel vnode init fix to 1.3 + revert switch