undo nonsense patch (r *is* signed or we have signedness mismatches elsewhere)