Teams are indeed back up, but now you have the option to turn off friendly-fire for PvP off servers, as well as the ability to form alliances with other teams, if you don't to accidentally kill your friends but also don't want to leave your current team.