Remove superseded workaround, bug 870794, r=roc