This is related to the new node check from commit 8819e5a45d5, not
the functions I mentioned before!