Revert recent SDHCI changes until fixed