P: de-couple vibrance and saturation from auto-tone

Can we please de-couple Vibrance/Saturation from the new and improved auto-tone "feature"?

It seems like whenever I hit auto-tone, the vibrance and saturation get jacked up way high. I tried a preset where I set them to zero, however, that is not an optimal solution, especially if I want to adjust something out of workflow order. I'd like to be able to have an auto-tone preset that leaves the V/S values the way they were, so if they're all set to -20 or 0 or 10, they stay that way.