Revert "Patch rolled back in order to allow vars in the changeset/branch field"

This reverts commit 4a89cce128b7e1bcee44a0502ab1c11cb3be3a8f.