FIX: Undo unrelated change