Use the new "keep_dirs" var instead of separately checking the