Revert "Merge branch 'Raidez-logging' into logging"

This reverts commit 934e19ebec3acd0437d0513314c26b9807ef23bd, reversing
changes made to 7179b97478e17dd860174e5640b40e93507b7a29.