Patch code and contents just enough to run with the new LH