Fix bad request ID management from 2.1 support changes