Slight modification to make it runnable with run-war