I am perfectly fine with that but we should probably capture that in a different JIRA. The client has `LOGGER` and `log` spread out in various areas that would be better cleaned up as a whole.