am c07cba5f: am eb77dbf0: Merge "Revert "manta: batching and timestamp issues""

* commit 'c07cba5fcbe41974f104704f8608708c836030de':
  Revert "manta: batching and timestamp issues"