The permanent fix for this has been promoted to nightly release channel, and will tomorrow also land up on stable. Update your instances when you see the update.