Revert "merged in logging branch"

This reverts commit 61366602701414675cbf1793e5a74bfda3dea4c0, reversing
changes made to 35fa1bb5ae1136505fcd8dc4d94057e6a92588d4.