Revert the rest of r37393 -- appears to be debugging stuff accidentally committed