back out some debugging changes