Rollback to TB 2.2.2

Need to roll back because of conflicts