Re-add debug stmts