Fix the vold switchable pair settings patch (again)