Bug 885717 - Fix bustage caused by landing the wrong patch. a=bustage