Remove logging oops
backport a js change
manually backport some stuff
more backported stuff