Fix regression caused by #1688, which prevent Servlet 2.5 container ti starts