Don\'t create tombstone directory. am: cb9625cbe5
am: 99b8a56616

* commit '99b8a5661614c3b973ab421ecff4ae40249c1579':
  Don't create tombstone directory.