This thread points at a PR that looks like it was supposed to address this by @jrlambs but the status is unclear. Is there something we can do to help move this one along?