Backport workaround for #591
This backports the workaround for issue #591 (closed) added in !680 (merged) along with the related FIXME comment.
This backports the workaround for issue #591 (closed) added in !680 (merged) along with the related FIXME comment.