Removed dependency on vih_oneliners