Revert changes of PR 260

This reverts the changes introduced with #260, because it breaks the apache configuration for some use cases.

See  https://groups.google.com/d/msgid/re3-dev/CABcS5EGb341m17F8Vwnwu9u1ZVEe8gC5f7sUjPt7AnxLn-bUAw%40mail.gmail.com