Vyatta-marked edits re-added.