Remove dependency on Apache.