Backing out bug 889085 (dddfd63f1414, f8c14bd80676) due to regression bug 987783. r=roc