How to switch Versioned Setting format from Kotlin to XML

Hi, 
We are using Teamcity Enterprise 2018.2.4 (build 61678). I had two questions:
1. Once versioned setting is enabled, Is there a way to switch format from kotlin to xml ? When I try to make changes to settings it disables the format selection dropdown menu. 

2. The reason we want to switch from Kotlin to XML is because there seems to be a bug with the Koltin DSL format, where with Kotlin some of the configuration for the Build Step aren't being checked into git. 
E.g we have a Build Step with runner type Rake of which the Launching Parameters for that rake runner never seem to make their way to git when using the Kotlin based DSL.
Example of the UI and the kotlin dsl it generated for this build step. 


Kotlin DSL generated: 

Where as , if I compare the XML from my audit logs for the same change when I try to disable any of those checkboxes shown in the image above. E.g I waned to de-select Test::Unit checkbox. I can see the XML audit logs for the same have this. 

On selection: 

1. <runner id="RUNNER_3" name="rake spec" type="rake-runner">
2. <parameters>
3. <param name="teamcity.step.mode" value="default" />
4. <param name="ui.rakeRunner.bunlder.exec.enabled" value="true" />
5. <param name="ui.rakeRunner.config.version" value="2" />
6. <param name="ui.rakeRunner.frameworks.cucumber.enabled" value="true" />
7. <param name="ui.rakeRunner.frameworks.rspec.enabled" value="true" />
8. <param name="ui.rakeRunner.frameworks.testunit.enabled" value="true" />
9. <param name="ui.rakeRunner.rake.tasks.names" value="%RAKE_TASK%" />
10. <param name="ui.rakeRunner.ruby.use.mode" value="default" />
11. </parameters>
    
    On de-selection a checkbox: 
12. <runner id="RUNNER_3" name="rake spec" type="rake-runner">
13. <parameters>
14. <param name="teamcity.step.mode" value="default" />
15. <param name="ui.rakeRunner.bunlder.exec.enabled" value="true" />
16. <param name="ui.rakeRunner.config.version" value="2" />
17. <param name="ui.rakeRunner.frameworks.cucumber.enabled" value="true" />
18. <param name="ui.rakeRunner.frameworks.rspec.enabled" value="true" />
19.  
20. <param name="ui.rakeRunner.rake.tasks.names" value="%RAKE_TASK%" />
21. <param name="ui.rakeRunner.ruby.use.mode" value="default" />
22. </parameters>

Which tells me that there is a bug because of which these runner parameters are never generated in the Kotlin dsl format. 

NOTE: Also on a sep note, the parameter configuration is mis-spelled: "ui.rakeRunner.bunlder.exec.enabled"


Would be great if you could help us show a way to either solve this bug or switch from Kotlin dsl to xml that way we can version control using the xml files (assuming they generate all such params)

Thank you