Reverted dsl_scan_visit to the way it was before