Update: we'll ship this fix with 8.6. It has just been merged.