Convert back to toolchain approach after forcing to template makefile approach.

I am developing a model and generating code using Simulink Embedded coder. I was having issues with the Toolchain approach not generating the libraries portion of the makefile correctly. I decided to try using a template makefile instead and forced the model parameters to change using the following command seen on other help questions.

>> set_param(model, 'MakeCommand', 'make_rtw TMF=1')

Now that I have the model building, I would like to switch back to the toolchain approach. When I run model advisor upgrade it claims I am already running the toolchain apporach, but my model parameters still shows the "Makefile configuration" and "Template makefile" which is suggesting I am still running the Template Makefile approach. Any idea how to force the model parameters back to the default Toochain apporach?

[James]

Just noticed that if I switch to grt.tlc from ert.tlc it shows the toolchain options. When I switch back I see the makefile options. Seems whatever parameter is set only effects the ert.tlc configuration.