chore: revert old approach