retroactivly revert /sound/soc changes within the oppo merge