Merge "Revert VolumeProvider API changes"