Revert "explicitly track node resolution"

Haven't tested this enough yet.

This reverts commit 14949b7b3558754c3e2ae37e7777ed4371c74d48.