Hotfix 110714

This is my best guess based on the diffs of referenced commits.
I don't have enough confidence on this one actually.