[TASK] Reverted last change