Issue 8498 workaround

r? @brson