Use commited apache fix instead of our fork