Remove dependency on apache module