Reflect #4440 onto GPT models, not just hybrid (#6476)