Git Commit Changes Group By

Since upgrading to WS 2022.1 the git commit modal is defaulting to "Group by > directory". Even if I change it to not group, the next commit I make it will be grouped again.

Is there any way to revert this to pre-2022.1 behaviour where it will remember your choice between commits?