Put back the logging I actually want (bug 888075)