fix: fix recently broken codebase and revert the changes back #2

Job	Run time
Security (pip-audit on Ubuntu)	16s
Code Coverage (pytest-cov)	24s
E2E Tests (gts-spec)	35s
Test Suite (macos-latest, python=3.11)	23s
Test Suite (ubuntu-latest, python=3.11)	25s
Test Suite (windows-latest, python=3.11)	1m 12s
	3m 15s

Provide feedback