Hotfix 110714

This is my best guess based on the diffs of referenced commits.
This one appears straight-forward, there is an exact similar change in the rust tree under the commit referenced.