Bug 987018 hadn't landed when I wrote this patch.