[FIX] Revert useless changes for a minimal diff