Hotfix 110714

This is my best guess based on the diffs of referenced commits.