Merge "Switch back to hardware ECC, but disable the badblock table."