Bug 1080313 - Follow up to fix even more breakage
Merge pull request #1789 from tschneidereit/master

Bug 1080313 - Follow up to fix even more breakage