This won't work now that we're running in hook_data.   Remove this and the has_empty_return_path function.