[MIRROR] Revert: Minor supermatter code refactor(#28848) (#2705)
[MIRROR] Revert: Minor supermatter code refactor(#28848) (#2705)

* Merge pull request #29771 from ShizCalev/singuloth-hungers

Revert: Minor supermatter code refactor(#28848)

* Revert: Minor supermatter code refactor(#28848)

GuyonBroadway/HippieStation,Memendia/HippieStation,Memendia/HippieStation,Memendia/HippieStation,GuyonBroadway/HippieStation,McBawbaggings/HippieStation,McBawbaggings/HippieStation,McBawbaggings/HippieStation,McBawbaggings/HippieStation,GuyonBroadway/HippieStation,Memendia/HippieStation,GuyonBroadway/HippieStation,Memendia/HippieStation,McBawbaggings/HippieStation,McBawbaggings/HippieStation,GuyonBroadway/HippieStation,GuyonBroadway/HippieStation,Memendia/HippieStation,GuyonBroadway/HippieStation,McBawbaggings/HippieStation,Memendia/HippieStation,Memendia/HippieStation,GuyonBroadway/HippieStation,McBawbaggings/HippieStation