Revert "Revert "Fix mandatory enforcer failure on augmented nodes""