This is a partial revert of the previous patch. The inline setup of
the logger ends up causing issues when this is consumed by other
libraries that want control over the logger.
Closes-Bug: #1697452
This reverts commit 9a27201416.
Change-Id: I1d61d4952aef1039e72a2aac629cb13a6a15d7b2