Only unverify on block/drop [PD-809]

All tests pass.