Removed wayf skipping.