Don't pull this yet, just previewing changes for #1606

It's a little hoaky, but we get our waddell id by snooping on the logging output from flashlight.