Revert "Make NodeValidator injectable"

This reverts commit a95c3cf3e8aad81d1a4d74d113aebe5d8dc2aef2.