I would rather not merge this until we figure out why these checks are needed for BDD and not for production.  noderoles should not disappear without good reason.