Emergency fix for broken tree (mozlog update)

Same as #3006, but also disables a failing test.

Closes #3006.