JSR358: Make it work on a locally patched Tomcat 8