The fix for bug 14841 only removed part of the logging. (cherry picked from commit b9b026c9)
mentioned in commit 200001ce