This reverts commit 8b081204 to see if it is the cause of the coverage OOM kills.

Merging on red to try and fix the build.