Revert "should work now"

Conflicts:
	war/WEB-INF/web.xml