Backport apache24 fix from trunk.