rollback some debugging changes