Bug 956360 - Follow-up: Port changes upstream. r=trivial