bug: revert changes from refactoring