Reverting commit eed7d17d8201b79572fee6b373b2292172ddc4fa
See:
http://marc.info/?l=tomcat-user&m=141756138531200&w=2
https://issues.apache.org/bugzilla/show_bug.cgi?id=57252