This reverts commit d9c3f5df, which
should not have been merged via mmc-next.  It's in arm-soc instead now.