[dm-cache] revert some more cruft that appeared during recent merge with heinz