Merge "Revert "Add feature flag for "no data" backup calls""