[TASK] Reverts last 2 commits