Output of a93dac381f5 + local mods.