This reverts commit 53dbe5d8.

This previous patch made logger function not reentrant so reverting until we can get a fix without that issue