am c4b6f87f: am 7125f959: Revert "Zero blocks before BLKDISCARD"

* commit 'c4b6f87f7ab969be7ee177baa8704774869ecb56':
  Revert "Zero blocks before BLKDISCARD"