Bug 1015975 - Don't use the data enabled value from Single Variant if the user has made changes