[major] Normalize even harder