Reverting back to old role/vars method