Less unnecessary datastream versions on replacement.
Merge pull request #560 from willtp87/7.x.ds_versions

Less unnecessary datastream versions on replacement.