Rollback of recent changes to tensor.{h,cc}