Revert "refactor: less movement of code as the ref implementation"

This reverts commit dfe1367.

Author: mikechu-optimizely

OptimizelySDK/Bucketing/DecisionService.cs

@@ -56,7 +56,6 @@ public bool DecisionBatchInProgress
                 {
                     SaveToUserProfileService();
                 }
-
                 _decisionBatchInProgress = value;
             }
         }
@@ -169,13 +168,6 @@ OptimizelyDecideOption[] options
                             UserProfileUtil.IsValidUserProfileMap(userProfileMap))
                         {
                             _userProfile = UserProfileUtil.ConvertMapToUserProfile(userProfileMap);
-                            decisionVariationResult =
-                                GetStoredVariation(experiment, _userProfile, config);
-                            reasons += decisionVariationResult.DecisionReasons;
-                            if (decisionVariationResult.ResultObject != null)
-                            {
-                                return decisionVariationResult.SetReasons(reasons);
-                            }
                         }
                         else if (userProfileMap == null)
                         {
@@ -189,6 +181,17 @@ OptimizelyDecideOption[] options
                                 reasons.AddInfo("The UserProfileService returned an invalid map."));
                         }
                     }
+
+                    if (_userProfile != null)
+                    {
+                        decisionVariationResult =
+                            GetStoredVariation(experiment, _userProfile, config);
+                        reasons += decisionVariationResult.DecisionReasons;
+                        if (decisionVariationResult.ResultObject != null)
+                        {
+                            return decisionVariationResult.SetReasons(reasons);
+                        }
+                    }
                 }
                 catch (Exception exception)
                 {