Reverted to TAO 1.1 commit