Improved compatibility with Apache 2.4.