Please don't merge this commit.

It's just temporary scaffolding to ferret out what's causing autotester failure.