cairo: Reenable optimization