The fix for bug 14841 only removed part of the logging. (cherry picked from commit b9b026c9) (cherry picked from commit 1e51b4d3)