Bug 853045 - Follow-up: Address review comment and avoid bustage. r=me