Really fix war

This corrects the root cause of the war file fixes.