VE-1669: Better band-aid, load only when VE loads