Remove coverage workarounds.
That's not needed any more.
Merge bug25468
stable to default