Ref. https://esp32.com/viewtopic.php?f=2&t=7307
Make output similar to previous implementation.
Required first step before merging back to mainline.