Reenable deleted optimization