DVONE-1275 temporarily change the routine and see what breaks, but also print to stderr when the function is used.  At this point the tests are so broken even before the change we can't see what is going on.
DVONE-1275 Will dropping the table help?