commented out debug output
(cherry picked from commit 5539234)
reformat
(cherry picked from commit ea9dc82)