This reverts commit dbec3b30 as it should never have been applied to the ASoC tree at all, let alone 3.2.