revert only_if commands and change to use short node.name