Rebasing when using versioned settings

I'm using using configuration-as-code via Kotlin and the "Versioned Settings" option, with "Synchronization enabled" and (initally) "Allow editing project settings via UI".

At one point, I made some changes in the UI, then decided I didn't like them - so i reset my git branch to an earlier state, then continuing making some other changes.  I then pushed a new commit, which didn't include the UI-triggered commit.

When I did so, I got this message as the "Current Status" in the Versioned Settings dialog:

There is a more recent commit made by the server as a result of UI changes: <ui-created-commit-hash>, skip updating settings to revision <my-hand-edited-commit-hash>

I tried clicking the "Load project settings from VCS" button, hoping this would allow me to override the UI-created commit - didn't work, still got the same message.

I then tried turning OFF "Allow editing project settings via UI", then clicked "Load project settings from VCS". Didn't help.  Made another commit, after turning off "Allow editing project settings via UI", and pushed.  Still didn't help.

Is there any way to remove a UI-created commit?