revert mutant version and reimplement fine-grain reporting