Merge "remove the last of the legacy log helpers"