Bug 1080313 - Follow up to fix even more breakage