Rewind previous commit

Talking to Peter we concluded that this safeguarding against populating a node is not related to any use case we know of. But it adds complexity.