Bug 957185 - Back out some of the debug logging in 079fff0ae88a