Node shall wander no more

Waiting on a Issue# for the first hotfix of the Dec17 release will update when we have one.