I did it already, in the "Apache adjustments" PR.