Revert recent changes cuz they made things worse