refactor: partially revert wrong change