Backed out changeset 27dc0066cd2 (Bug 873072) due to bug 896992. a=lsblakk