Bug 956935 - Follow-up: Fix bustage. r=me