Bug 874008: Fix bustage r=ekr