Revert "[SmokeTest] Add request mode choice"