Back out last patch (untested/unreviewed).