From 14c8b0d247c696c84752d7474cf8a4c2f85cf817 Mon Sep 17 00:00:00 2001
From: JasonGlazer <jglazer@gard.com>
Date: Wed, 22 Jan 2020 12:04:04 -0600
Subject: [PATCH] Rolling back original fix.

---
 src/EnergyPlus/OutputProcessor.cc | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/EnergyPlus/OutputProcessor.cc b/src/EnergyPlus/OutputProcessor.cc
index 17ce91dc520..9e51234d379 100644
--- a/src/EnergyPlus/OutputProcessor.cc
+++ b/src/EnergyPlus/OutputProcessor.cc
@@ -2251,8 +2251,8 @@ namespace OutputProcessor {
             }
 
             // End use subcategory
-//             if (!EndUseSub.empty() && !UtilityRoutines::SameString(EndUseSub,"General")) { // attempted fix for 7556 but probably not the right approach
-            if (!EndUseSub.empty()) {
+//            if (!EndUseSub.empty() && !UtilityRoutines::SameString(EndUseSub, "General")) { 
+            if (!EndUseSub.empty()) { 
                 Found = UtilityRoutines::FindItem(EndUseSub + ':' + EndUse + ':' + ResourceType, EnergyMeters);
                 if (Found != 0) {
                     ++VarMeterArrays(NumVarMeterArrays).NumOnMeters;
@@ -5644,8 +5644,7 @@ void SetupOutputVariable(std::string const &VariableName,           // String Na
                 EndUseSub = EndUseSubKey;
                 OnMeter = true;
             } else {
-//                EndUseSub = "General"; // attempted fix for 7556 but probably not the right approach
-                EndUseSub = "";
+                EndUseSub = "General"; 
             }
             if (present(GroupKey)) {
                 Group = GroupKey;