This reverts commit d03130d3.
That was dependent on an isolationtester.c change that now proves
to be broken; we will need to find another solution.