Bringing back logging lost due to a bad merge