Bug 875934 - Moar fixups post backout of bug 870676 \o/
Merge mozilla-central and inbound