The Tomcat issue causing this in the first place: https://issues.apache.org/bugzilla/show_bug.cgi?id=57314