Updates for apache 24

Let's move this back down to where it was before.