Hi Michal,
I did not revert b8e25ef16a58 ("mmc: sdhci: Read capabilities register1 and update host caps") since without those changes, the UHS caps would not disabled if you forgot to add the "no-1-8-v" property.
I think relying on the voltage configuration instead is worth keeping.
Best Regards,
Ben