Revert three commits to ease merge of testCoverage branch.