Revert "fix: align with zingo_common_components"
#230
+240
−389
Merged