[#3] Simplify things so apache is happy