Restore commonVars as it is used by other roles