Switch away from the static node info
Merge pull request #1736 from brendandburns/scheduler

Switch away from the static node info