Revert "Unify setUpEffectiveNodes"